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 | 187 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 31 deletions(-)
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 630bb1c..6edcac4 100644
--- a/web/web/GwSp.aspx
+++ b/web/web/GwSp.aspx
@@ -1,6 +1,8 @@
锘�<%@ 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" src="/web/js/jquery.min.js?v=2.1.4"></script>
<script type="text/javascript" language="javascript">
$(document).ready(function() {
@@ -15,12 +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() },
+ 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);
@@ -85,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();
});
}
@@ -111,11 +116,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 +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 () {
@@ -168,7 +187,10 @@
loadPageList();
-
+
+ $(document).on("click", ".action-create", function () {
+ window.location.href = "gwspupdate.aspx";
+ });
$(document).on("click", ".action-export", function() {
@@ -179,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"])%>;
@@ -342,6 +372,12 @@
}
});
+
+
+ $('#parentId').select2({
+ placeholder: "璇烽�夋嫨鍏宠仈浜у搧",
+ allowClear: true
+ });
</script>
</asp:Content>
<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">瀹㈡埛璐﹀彿淇℃伅閰嶇疆</asp:Content>
@@ -354,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>
@@ -368,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>
@@ -385,12 +421,21 @@
<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>
</div>
<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 +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>
@@ -408,18 +453,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" />
+ <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>
@@ -433,16 +487,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 +529,17 @@
<th>
鎵╁睍鍙�
</th>
- <th>
+ -->
+ <%--<th>
瀹㈡埛IP
- </th>
+ </th>--%>
<th>
鐘舵��
</th>
- <th colspan="4">
+ <th>
+ 婵�娲绘椂闂�
+ </th>
+ <th class="text-center" width="150px">
鎿嶄綔
</th>
</tr>
@@ -474,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>
@@ -483,11 +566,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 +634,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>
+ <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 +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