From a6a84e6f677447342e8c5984fdc0b52241b92ce3 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 01:20:34 +0800
Subject: [PATCH] 客户管理分配个性产品优化、返回URL优化
---
web/web/GwOrderList.aspx | 114 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 26 deletions(-)
diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index 09b5c4a..1fda705 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -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">
@@ -122,6 +151,10 @@
</div>
<div class="input-group m-b">
<input type="button" value="鏌ヨ" class="btn btn-primary action-query" />
+ <% if (!string.IsNullOrEmpty(backUrl))
+ { %>
+ <a class="btn btn-default action-back" href="javascript:;" onclick="return window.location = '<%=backUrl %>'">杩斿洖</a>
+ <% } %>
</div>
</div>
<div class="table-responsive">
@@ -130,26 +163,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 +194,7 @@
</th>
<th>鐘舵��
</th>
- <th class="text-right">鎿嶄綔
+ <th class="text-center">鎿嶄綔
</th>
</tr>
</thead>
@@ -196,27 +233,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 +374,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">
--
Gitblit v1.9.1