修改

src/main/webapp/resources/view/sso/left_nav.html

@@ -48,7 +48,7 @@
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_management'}"><span ui-sref="ssoManagement">员工管理</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_permission'}"><span ui-sref="ssoPermission">角色权限</span></li>
 		<li ng-class="{'active' : active == 'sso_address'}"><span ui-sref="ssoAddress">收货地址</span></li>
-		<li ng-class="{'active' : active == 'sso_invoice'}"><span ui-sref="ssoInvoice">发票管理</span></li>
+		<li ng-class="{'active' : active == 'sso_invoice'}"><span ui-sref="ssoInvoice">发票信息</span></li>
 		<li ng-class="{'active' : active == 'vendor_pay_center'}" ng-if="userInfo.enterprise.uu && userInfo.enterprise.isVendor == 313"><span ui-sref="gatheringAccount({'tab': 'accountTab'})">收款账户</span></li>
 		<li ng-class="{'active' : active == 'buyer_pay_center'}"><span ui-sref="payAccount({'status': 'pay-info'})">付款账户</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_logistics'}">-->

src/main/webapp/resources/view/sso/ssoInvoice.html

@@ -515,7 +515,8 @@
     <!--<div style="background: #f5f5f5; height: 11px" ng-if="!changeBillStatusFlag"></div>-->
     <!--发票操作导航-->
     <div class="match-menu" ng-if="changeBillStatusFlag">
-                <span class="active">
+                <span ng-if="invoices.length === 0"></span>
+                <span class="active" ng-if="invoices.length > 0">
                     <a ng-bind="isAdd?'新增发票信息':'修改发票信息'"></a>
                         <i class="fa fa-remove" ng-click="exitEdit()" ng-if="invoices.length > 0"></i>
                 </span>

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice_record.html

@@ -236,7 +236,7 @@
         <div class="invoice-record">
             <div class="invoice-search">
                 <div class="fr">
-                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="商家名称/订单号/发票抬头/收票人/联系电话"/>
+                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="卖家/订单号/收票人/联系电话"/>
                     <button ng-click="searchByKey()">搜索</button>
                 </div>
             </div>

src/main/webapp/resources/view/usercenter/forstore/buyer_no_invoice.html

@@ -289,7 +289,7 @@ body div.ng-table-pager a.page-a {
                                 <!--<a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>-->
                             <!--</td>-->
                             <td>
-                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
+                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{item.orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
                             </td>
                             <td ng-bind="item.paytime | date: 'yyyy-MM-dd HH:mm'">
 

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -435,48 +435,58 @@
                         <td colspan="2" style="position: relative;padding: 0px">
                             <div class="clearboth tbpadding" >
                                 <div class="pull-left clearboth w65" style="margin-bottom: 0px">
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50 clearboth">
+                                    <div class="list clearboth pull-left" style="width: 50%">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">发票抬头: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.invoicetitle}}" style="max-width: 224px">{{item.invoicetitle}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">税务登记号: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        <div class="clearboth w100">
+                                            <div class="pull-left name">买家: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.submiter.userName}}" style="max-width: 224px">{{item.submiter.userName}}</div>
                                         </div>
-                                    </div>
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">开票金额: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.price}}" style="max-width: 224px">{{'￥' + item.price || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">开户银行: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
-                                        </div>
-                                    </div>
-
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">单位电话: </div>
                                             <div class="pull-left marginLeft" title="{{item.billInfo.companyPhone}}">{{item.billInfo.companyPhone || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">单位地址: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype !== 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="pull-left list clearboth" style="width: 50%">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">税务登记号: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">开户银行: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">开户银行账号: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankAccount}}" style="max-width: 200px">{{item.billInfo.bankAccount || '-'}}</div>
                                         </div>
-                                    </div>
-                                    <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                        <div class="pull-left name">单位地址: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
-                                    </div>
-                                    <div class="pull-left w50">
-                                        <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
-                                            <p ng-repeat="(col,orderid) in item.orderids">
-                                                <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
-                                                <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
-                                            </p>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -568,7 +578,7 @@
     <div class="vendor-invoice" ng-if="active == 'apply_record'">
         <div class="invoice-search" style="margin-top: 5px;margin-bottom: 16px; width: 100%">
             <div class="fr">
-                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
+                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="买家/订单号/收票人/联系电话"/>
                 <button ng-click="searchByKey(keyword)">搜索</button>
             </div>
         </div>
@@ -599,51 +609,60 @@
                         <td colspan="2" style="position: relative;padding: 0px">
                             <div class="clearboth tbpadding" >
                                 <div class="pull-left clearboth" style="margin-bottom: 0px;width: 65%">
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50 clearboth">
+                                    <div class="list clearboth pull-left" style="width: 50%">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">发票抬头: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.invoicetitle}}" style="max-width: 224px">{{item.invoicetitle}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">税务登记号: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        <div class="clearboth w100">
+                                            <div class="pull-left name">买家: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.submiter.userName}}" style="max-width: 224px">{{item.submiter.userName}}</div>
                                         </div>
-                                    </div>
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">开票金额: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.price}}" style="max-width: 224px">{{'￥' + item.price || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">开户银行: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
-                                        </div>
-                                    </div>
-
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">单位电话: </div>
                                             <div class="pull-left marginLeft" title="{{item.billInfo.companyPhone}}">{{item.billInfo.companyPhone || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">单位地址: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype !== 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="pull-left list clearboth" style="width: 50%">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">税务登记号: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">开户银行: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">开户银行账号: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankAccount}}" style="max-width: 200px">{{item.billInfo.bankAccount || '-'}}</div>
                                         </div>
-                                    </div>
-                                    <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                        <div class="pull-left name">单位地址: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
-                                    </div>
-                                    <div class="pull-left w50">
-                                        <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
-                                            <p ng-repeat="(col,orderid) in item.orderids">
-                                                <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
-                                                <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
-                                            </p>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
                                         </div>
                                     </div>
-
                                 </div>
                                 <div class="pull-right clearboth" style="margin-bottom: 0px;width: 35%">
                                     <div class="pull-left w100 clearboth">