Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

username@email.com

2021-09-22 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx

@@ -214,6 +214,12 @@
                        </select>
                    </td>
                    <td class="ali03">
                        印件名称：
                    </td>
                    <td>
                        <input id='txtSearchyjname' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        付款方式：
                    </td>
                    <td>
@@ -242,8 +248,19 @@
                            <asp:listitem value="-1">差评</asp:listitem>
                        </asp:dropdownlist>
                    </td>
                </tr>
                 <tr>
                    <td class="ali03">                        
                    </td>
                    <td>
                    </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td> </td>
                    <td>
                        <asp:button id="btn_Search" text="查询" runat="server" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                        <input type="hidden" id='txtCommission' runat="server" />
@@ -304,6 +321,9 @@
                        </th>
                        <th width="36">
                            数量
                        </th>
                        <th width="36">
                            单位
                        </th>
                        <th style="text-align: center;" width="50">
                            订单状态
@@ -389,8 +409,8 @@
                                            <%#Eval("SellerOrderId")%></a>--%>
                                </td>
                                <td style="text-align: center;">
                                 <div style="width: 140px; word-wrap: break-word; text-align:justify;">
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("BuyerName").ToString()%> 资料' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
                                 <div style="word-wrap: break-word; text-align:justify;">
                                    <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
                                        </div>
                                </td>
                                <td>
@@ -406,6 +426,9 @@
                                    <%#Eval("OrderExtend.PrintNum")%>
                                </td>
                                <td>
                                    <%#Eval("yssldw")%>
                                </td>
                                <td>
                                    <%#Eval("OrderStateObj.Name")%>
                                </td>
                                <td>