From 24d599247b33a9c9b928d887465c3dcec9f9ba63 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 09:26:59 +0800
Subject: [PATCH] 优化
---
web/web/GwOrderList.aspx | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index 9f9cbe4..08155ad 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -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,17 +129,19 @@
class="form-inline">
<div class="ibox">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <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">
+ <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">鍏徃鍚嶇О</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="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
- </div>
+
<div class="input-group m-b">
<div class="input-daterange input-group " id="datepicker">
<span class="input-group-addon">鏃堕棿鑼冨洿 <i class="fa fa-calendar"></i></span>
@@ -122,6 +153,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">
@@ -132,8 +167,9 @@
</th>
<th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐︽埛
</th>
+ <th>鍏徃鍚嶇О</th>
<th>浜у搧鍚嶇О
</th>
<%--<th>濂楅ID
@@ -207,20 +243,34 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛璐﹀彿</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">
+ 鍏徃鍚嶇О</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>
<%--
@@ -327,7 +377,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