From adee7a71ba7ab1b63cab63381dfe1846437853d6 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 02 三月 2023 17:37:05 +0800
Subject: [PATCH] 增加分销商配置

---
 web/web/GwOrderList.aspx |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index b801ca0..08155ad 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -129,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">鏃堕棿鑼冨洿&nbsp;<i class="fa fa-calendar"></i></span>
@@ -151,6 +153,10 @@
         </div>
         <div class="input-group m-b">
             <input type="button" value="鏌ヨ" class="btn btn-primary action-query" />
+            <% if (!string.IsNullOrEmpty(backUrl))
+                { %>
+            &nbsp;<a class="btn btn-default  action-back" href="javascript:;" onclick="return window.location = '<%=backUrl %>'">杩斿洖</a>
+            <% } %>
         </div>
     </div>
     <div class="table-responsive">
@@ -161,8 +167,9 @@
                     </th>
                     <th>鐭俊璐﹀彿
                     </th>
-                    <th>瀹㈡埛璐﹀彿
+                    <th>瀹㈡埛璐︽埛
                     </th>
+                    <th>鍏徃鍚嶇О</th>
                     <th>浜у搧鍚嶇О
                     </th>
                     <%--<th>濂楅ID
@@ -236,7 +243,7 @@
                         </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">

--
Gitblit v1.9.1