From d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:49:28 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop
---
web/web/GwSp.aspx | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 11 deletions(-)
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 630bb1c..551b7a3 100644
--- a/web/web/GwSp.aspx
+++ b/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"); //璐﹀彿ID
+ //window.open("gwOrderCreate.aspx?spId=" + spID, 'gwOrderCreate');
+ window.location.href = "gwOrderCreate.aspx?spId=" + spID;
});
//缂栬緫璐﹀彿
@@ -168,7 +179,10 @@
loadPageList();
-
+
+ $(document).on("click", ".action-create", function () {
+ window.location.href = "gwspupdate.aspx";
+ });
$(document).on("click", ".action-export", function() {
@@ -179,9 +193,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 +364,12 @@
}
});
+
+
+ $('#parentId').select2({
+ placeholder: "璇烽�夋嫨鍏宠仈浜у搧",
+ allowClear: true
+ });
</script>
</asp:Content>
<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">瀹㈡埛璐﹀彿淇℃伅閰嶇疆</asp:Content>
@@ -385,6 +413,15 @@
<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">鍏宠仈浜у搧ID</span>
+ <select name="productId" id="productId" class="form-control">
+ <%=GetProductOptions("")%>
+ </select>
+ </div>
+ </div>
<div>
</div>
<div class="form-group">
@@ -414,6 +451,15 @@
</select>
</div>
</div>
+ <div class="form-group">
+ <div class="input-group m-b">
+ <select name="apID" 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" />
@@ -436,13 +482,19 @@
SP璐﹀彿/鎺ュ叆鍗忚/褰掑睘瀹㈡埛
</th>
<th>
+ 鍏宠仈浜у搧
+ </th>
+ <th>
閫氶亾
</th>
<th>
澶辫触琛ュ彂
</th>
<th>
+ <!-- add: yangzh by 2022-03-14 start
鏉℃暟/浣欓/浠樿垂鏂瑰紡/鍗曚环/鍛婅
+ -->
+ 鍓╀綑鎬绘潯鏁�/鍩烘湰鏉℃暟/璧犻�佹潯鏁�/浠樿垂鏂瑰紡/鍗曚环/鍛婅
</th>
<th>
璐﹀彿閰嶇疆灞炴��
@@ -483,11 +535,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,6 +603,7 @@
</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 ">
@@ -582,6 +635,47 @@
</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="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="model-abstract" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog form-horizontal">
<div class="modal-content animated ">
--
Gitblit v1.9.1