SMGW_NewWeb.git

			@@ -19,7 +19,7 @@
			function loadPageList() {

			var clientId = $("#ClientID").val();
			var clientName = $("#ClientName").val();
			var company = $("#Company").val();
			var spId = $("#SpID").val();
			var startDate = $("#sDate").val();
			var endDate = $("#eDate").val();
			@@ -28,7 +28,7 @@
			url: "GwOrder.ashx",
			type: "POST",
			//data: { action: "gwOrderList", SpID: SpID, ClientID: ClientID, ClientName: ClientName, sDate: sDate, EndTime: EndTime, pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
			data: { action: "gwOrderList", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: -1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
			data: { action: "gwOrderList", clientId: clientId, company: company, spId: spId, startDate: startDate, endDate: endDate, flag: -1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
			success: function (result) {
			if (result.OK) {
			$("#orderListTable tbody").html(result.Message.Table);
			@@ -43,6 +43,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("订单明细");
			@@ -53,8 +78,12 @@
			//$("#orderDialog #action").val("detail");
			$("#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 #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
			$("#orderDialog #clientId").val(r.Message.ClientId);
			$("#orderDialog #clientCompany").val(r.Message.Company).attr("readonly", "readonly"); //转换名称
			//$("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
			$("#orderDialog #productId").val(r.Message.ProductId);
			$("#orderDialog #productName").val(r.Message.ProductName).attr("readonly", "readonly"); //转换名称
			//$("#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");
			@@ -65,9 +94,9 @@
			$("#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 #status").val(r.Message.Status).attr("disabled", "disabled");
			$("#orderDialog #status").val(r.Message.Status);
			$("#orderDialog #statusName").val(statusToName(r.Message.Status)).attr("disabled", "disabled"); //转换名称
			$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

			$("#orderDialog").modal("show");
			@@ -100,16 +129,16 @@
			class="form-inline">
			<div class="ibox">
			<div class="input-group m-b">
			<span class="input-group-addon">SPID</span>
			<input type="text" name="SpID" id="SpID" value="<%=SpID %>"" class="form-control" />
			<span class="input-group-addon">客户账号</span>
			<input type="text" name="ClientID" id="ClientID" value="<%=ClientId %>" class="form-control" />
			</div>
			<div class="input-group m-b">
			<span class="input-group-addon">客户ID</span>
			<input type="text" name="ClientID" id="ClientID" class="form-control" />
			<span class="input-group-addon">公司名称</span>
			<input type="text" name="Company" id="Company" class="form-control " />
			</div>
			<div class="input-group m-b">
			<span class="input-group-addon">客户名称</span>
			<input type="text" name="ClientName" id="ClientName" class="form-control " />
			<span class="input-group-addon">短信账号</span>
			<input type="text" name="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
			</div>
			<div class="input-group m-b">
			<div class="input-daterange input-group " id="datepicker">
			@@ -130,26 +159,30 @@
			<tr class="header">
			<th>订单ID
			</th>
			<th>账号ID
			<th>短信账号
			</th>
			<th>客户ID
			<th>客户账号
			</th>
			<th>产品ID
			<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>
			@@ -157,7 +190,7 @@
			</th>
			<th>状态
			</th>
			<th class="text-right">操作
			<th class="text-center">操作
			</th>
			</tr>
			</thead>
			@@ -196,27 +229,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="" />
			</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="" />
			<input type="hidden" class="form-control" name="productId" id="productId" value="" />
			</div>
			</div>
			<%--
			@@ -323,7 +370,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">