From c052583025ff87735d2120dc63aeee7ea5e5524e Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 09:25:11 +0800
Subject: [PATCH] 多项优化
---
web/web/GwSp.aspx | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 5003bf1..6edcac4 100644
--- a/web/web/GwSp.aspx
+++ b/web/web/GwSp.aspx
@@ -2,7 +2,7 @@
<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" src="/web/js/jquery.min.js?v=2.1.4"></script>
<script type="text/javascript" language="javascript">
$(document).ready(function() {
@@ -17,14 +17,14 @@
var clientID = $("#clientID").val();
var opID = $("#opID").val();
var routerType = $("#routerType").val();
- var clientName = $("#clientName").val();
+ var company = $("#company").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(), resendStatus: resendStatus, productId: productId },
+ data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, company: company, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
success: function(result) {
if (result.OK) {
$("#gwspTable tbody").html(result.Message.Table);
@@ -89,7 +89,8 @@
method: "POST",
data: { idArray: $.toJSON(idArray), cmopID: cmopID, ctopID: ctopID, unopID: unopID, cmGroupID: cmGroupID, cuGroupID: cuGroupID, ctGroupID: ctGroupID, action: "batchUpdateOp" },
success: function(result) {
- mytek.alert(result.Message, result.OK, function() {
+ mytek.alert(result.Message, result.OK, function () {
+ $("#opDialog").modal("hide");
loadPageList();
});
}
@@ -124,7 +125,7 @@
//鍏呭��
$(document).on("click", ".action-modal-charge", function () {
- var spID = $(this).data("id"); //璐﹀彿ID
+ var spID = $(this).data("id"); //鐭俊璐﹀彿
//window.open("gwOrderCreate.aspx?spId=" + spID, 'gwOrderCreate');
window.location.href = "gwOrderCreate.aspx?spId=" + spID;
});
@@ -142,8 +143,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 () {
@@ -193,9 +201,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"])%>;
@@ -374,7 +390,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>
@@ -388,14 +404,14 @@
-->
<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="company" id="company" class="form-control col-md-2" />
</div>
</div>
@@ -408,7 +424,7 @@
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">鍏宠仈浜у搧ID</span>
+ <span class="input-group-addon">鍏宠仈浜у搧鍚嶇О</span>
<select name="productId" id="productId" class="form-control">
<%=GetProductOptions("")%>
</select>
@@ -419,7 +435,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>
@@ -428,7 +444,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>
@@ -437,7 +453,7 @@
<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>
@@ -445,8 +461,8 @@
</div>
<div class="form-group">
<div class="input-group m-b">
- <select name="apID" class="form-control" id="RESEND_STATUS">
- <option value="3">鑷姩琛ュ彂</option>
+ <select name="RESEND_STATUS" class="form-control" id="RESEND_STATUS">
+ <option value="3">--琛ュ彂璁剧疆--</option>
<option value="1">鍚敤琛ュ彂</option>
<option value="0">鍋滅敤琛ュ彂</option>
</select>
@@ -455,9 +471,9 @@
<div class="form-group">
<div class="input-group m-b">
<input type="button" value="鏌ヨ" class="btn btn-primary action-query" />
+ <input class="btn btn-warning action-create" value="鍒涘缓鏂拌处鍙�" type="button" />
<input type="button" value="鎵归噺淇敼閫氶亾" class="btn btn-danger action-modal-op" />
<input type="button" class="btn btn-info action-export" value="瀵煎嚭鏁版嵁" />
- <input class="btn btn-warning action-create" value="鍒涘缓鏂拌处鍙�" type="button" />
</div>
</div>
</div>
@@ -471,21 +487,40 @@
<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>
@@ -494,13 +529,17 @@
<th>
鎵╁睍鍙�
</th>
- <th>
+ -->
+ <%--<th>
瀹㈡埛IP
- </th>
+ </th>--%>
<th>
鐘舵��
</th>
- <th colspan="4">
+ <th>
+ 婵�娲绘椂闂�
+ </th>
+ <th class="text-center" width="150px">
鎿嶄綔
</th>
</tr>
@@ -518,7 +557,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>
@@ -690,5 +729,5 @@
<div id="mask" class="mask">
<span></span>
<img src="img/spinning-circles.svg" alt="杞藉叆涓�..." /></div>
- </div>
+
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.1