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/InvoicingApply.aspx

@@ -17,7 +17,12 @@
        function Viewkaipiao(Keyid, SellerOrderId) {
            window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId , '', '');
        }
        

        function ViewRemark(str) {
            var re = /<br>/g;
            //str = str.replace(re, "\n");
            alertMsg(str);
        }

        //查看客户资料
        function View(personId) {
@@ -137,10 +142,8 @@
                    <tr>
                       <%-- <th width="25">
                        </th>--%>
                        <th width="25">
                            编号
                        </th>
                          <th style="text-align: center;" width="70">
                        <th width="25">编号</th>
                        <th style="text-align: center;" width="70">
                           申请开票时间
                        </th>
                           <th style="text-align: center;" width="70">
@@ -159,8 +162,9 @@
                         <th width="60">
                            金额
                        </th>
                       
                        
                       <th width="50">
                            备注
                        </th>                        
                         <th width="60">
                           开票状态
                        </th>
@@ -168,9 +172,6 @@
                          客户签收

                        </th>
                       
                      
                      
                    </tr>
                </thead>
                <tbody>
@@ -203,13 +204,9 @@
                                </td>
                                 <td style="text-align: center;">
                                        <%#Eval("BusinessManager")%>

                                   
                                </td>
                                <td style="text-align: center;">
                                        <%#Eval("SellerOrderId")%>

                                   
                                </td>
                                 
                                <td style="text-align: center;">
@@ -218,31 +215,24 @@
                                        </div>
                                </td>
                                
                                <td>
                                    
                                <td>                                    
                                      <a href='javascript:void(0)' title=' <%#Eval("shuliang")%> ' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("SellerOrderId")%>")'> <%#Eval("shuliang")%>    </a>
                                    
                                  
                                </td>
                                                            
                                <td>
                                    <%#Eval("jine", "{0:F}")%>
                                </td>
                                 <td>
                                   
                                <td>
                                     <a href="javascript:void(0)" title="<%#Eval("remark").ToString().Replace("\r\n", "<br />")%>" class="a_under" onclick="ViewRemark('<%# Eval("remark").ToString().Replace("\r\n", "<br>")%>')"><%#Eval("remark").ToString().Length>0?"点击查看":"" %> </a>
                                    
                                </td>
                                 <td>                                   
                                      <%#Eval("KaipiaoshenqingName")%>
                                     
                                       

                                </td>
                                 <td>
                                      

                                       <a href='javascript:void(0)' title=' <%#Eval("KehuqianshouName")%> ' class='a_under' onclick='<%#Eval("Kehuqianshou").ToString()=="1"?"Viewkehu(\""+Eval("Keyid")+"\",\""+Eval("SellerOrderId")+"\")":"" %>    '> <%#Eval("KehuqianshouName")%>    </a>
                                    
                                   
                                
                                     
                                </td>