edit

Web/EDelivery/ExpressInfo.aspx

@@ -1,8 +1,8 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="ExpressInfo.aspx.cs" Inherits="EDelivery_ExpressInfo" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
-    <script type="text/javascript" src="js/ExpressInfo.js"></script>     
-    
+    <script type="text/javascript" src="js/ExpressInfo.js"></script>
+
     <style type="text/css">
         .win_tb {
             width: 96%;
@@ -58,6 +58,7 @@
         .word_shou {
             background-color: saddlebrown;
         }
+
         .word_green {
             background-color: forestgreen;
         }
@@ -83,36 +84,39 @@
     <div class="mini-fit">
         <div id="m_grid" class="mini-datagrid" style="width: 100%; height: 100%;" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_expresslist">
             <div property="columns">
-              <div type="indexcolumn" width="20"></div>
                 <div type="checkcolumn" width="20"></div>
                 <div field="tid" width="80" align="center" headeralign="center">订单编号</div>
-              <div field="out_sid" width="80" align="center" headeralign="center">运单号</div>
+                <div field="out_sid" width="80" align="center" headeralign="center">运单号</div>
                 <div field="company_name" width="60" align="center" headeralign="center">快递公司编码</div>
+                <div field="SupplierName" width="60" align="center" headeralign="center">供应商</div>
                 <div field="print_state" width="60" align="center" headeralign="center">打印状态</div>
                 <div field="receiver_state" width="60" align="center" headeralign="center">收货省份</div>
                 <div field="receiver_city" visible="false" width="60" align="center" headeralign="center">收货市</div>
                 <div field="receiver_district" visible="false" width="60" align="center" headeralign="center">收货区</div>
-                <div field="seller_memo" width="150" align="center" headeralign="center">订单备注</div>--%>
-               <div field="print_time" width="80" align="center" headeralign="center" renderer="printtimeTimeRenderer">打印时间</div>
-                <div id="id_printer" runat="server" visible="false"  field="printUser" width="40" align="center" headeralign="center">打印人</div>
+                <div field="seller_memo" width="150" align="center" headeralign="center">订单备注</div>
+                <div field="print_time" width="80" align="center" headeralign="center" renderer="printtimeTimeRenderer">打印时间</div>
+                <div id="id_printer" runat="server" visible="false" field="printUser" width="40" align="center" headeralign="center">打印人</div>
             </div>
         </div>
     </div>
 
     <div id="delivery_win" class="mini-window" title="指派供应商" style="width: 550px; height: 350px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
-             <tr>
+            <tr>
                 <td class="td1">发货方式</td>
                 <td class="td2" colspan="3">
-                    <select id="txtDeliveryType" style="width:80%;"><option value="物流发货">物流发货</option><option value="虚拟发货">虚拟发货</option></select>
+                    <select id="txtDeliveryType" style="width: 80%;">
+                        <option value="物流发货">物流发货</option>
+                        <option value="虚拟发货">虚拟发货</option>
+                    </select>
                 </td>
             </tr>
             <tr>
-            <tr>
-                <td class="td1">运单号</td>
-                <td class="td2">
-                    <input type="text" id="txtTransNo" /></td>
-            </tr>
+                <tr>
+                    <td class="td1">运单号</td>
+                    <td class="td2">
+                        <input type="text" id="txtTransNo" /></td>
+                </tr>
             </tr>
             <tr>
                 <td class="td1">物流公司</td>

Web/EDelivery/ExpressInfo.aspx.cs

@@ -17,7 +17,7 @@ public partial class EDelivery_ExpressInfo : BasePage
         _repTitle = "快递信息";
         PmTag = "expressinfo";
         //_selfCheckPermission = true;
-        _filterItem = "order,out_sid,file_name,import_user,fukuan,printman,finish_time";
+        _filterItem = "order,out_sid,file_name,import_user,fukuan,printman,finish_time,supplier";
         _filterDateBtn = false;
         _keyFilterVisible = false;
         _addVisible = false;

Web/EDelivery/js/ExpressInfo.js

@@ -46,7 +46,7 @@ function searchFn() {
     //form.setIsValid(false);
     //console.log("565656565", data);
     grid.load({
-        tid: s.tid, out_sid: s.out_sid, import_file: s.file_name, ImportUserName: s.import_user, printman: s.printman, finishdate1: s.finishdate1, finishdate2: s.finishdate2
+        tid: s.tid, out_sid: s.out_sid, import_file: s.file_name, ImportUserName: s.import_user, printman: s.printman, finishdate1: s.finishdate1, finishdate2: s.finishdate2, supplierId: s.supplier
     });
 }
 //清除查询内容