发票

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -237,8 +237,21 @@ define(['app/app'], function(app) {
             this.form.$setPristine();
             this.form.$setUntouched();
         }
+        function _deepCopy(target) {
+            if (typeof target !== 'object') return
+            // 判断目标类型，来创建返回值
+            var newObj = target instanceof Array ? [] : {}
+            for (var item in target) {
+                // 只复制元素自身的属性，不复制原型链上的
+                if (target.hasOwnProperty(item)) {
+                    newObj[item] = typeof target[item] === 'object' ? _deepCopy(target[item]) : target[item]
+                }
+            }
+            return newObj
+        }
         //修改发票
         $scope.modifyInvoice = function (invoice) {
+            invoice = _deepCopy(invoice)
             $scope.changeBillStatusFlag = true;
             $scope.isAdd = false;
             $scope.billType = invoice.kind

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

@@ -502,8 +502,8 @@
     <div class="ticket_record oder">
         <div class="oder01">
             <ul ng-class="{'active': changeBillStatusFlag}">
-                <li ng-class="{'active': tab == 'buyer_invoice' && !changeBillStatusFlag}"><a ng-click="changeBillStatusFlag = false" ui-sref="buyer_invoice">开票信息</a></li>
-                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">未开票</a></li>
+                <li ng-class="{'active': tab == 'buyer_invoice' && !changeBillStatusFlag}"><a ng-click="changeBillStatusFlag = false" ui-sref="buyer_invoice">发票信息</a></li>
+                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">待开票信息</a></li>
                 <li ng-class="{'active': tab == 'buyer_invoice-record'}"><a ui-sref="buyer_invoice-record">开票记录</a></li>
             </ul>
         </div>

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

@@ -17,6 +17,7 @@
         border: #dae5fd 1px solid;
         border-bottom: none;
         margin-bottom: 0!important;
+        table-layout: fixed;
     }
     .invoice-com-tab thead{
         height: 40px;
@@ -42,6 +43,9 @@
         height: 50px;
         vertical-align: middle;
         text-align: center;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
     .invoice-com-tab tbody>tr>td a.invoice-detail{
         display: block;
@@ -169,8 +173,8 @@
     <div class="ticket_record oder">
         <div class="oder01">
             <ul>
-                <li ng-class="{'active': tab == 'buyer_invoice'}"><a ui-sref="buyer_invoice">开票信息</a></li>
-                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">未开票</a></li>
+                <li ng-class="{'active': tab == 'buyer_invoice'}"><a ui-sref="buyer_invoice">发票信息</a></li>
+                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">待开票订单</a></li>
                 <li ng-class="{'active': tab == 'buyer_invoice-record'}"><a ui-sref="buyer_invoice-record">开票记录</a></li>
             </ul>
         </div>
@@ -186,21 +190,21 @@
                 <table class="invoice-com-tab table" ng-table="billRecordTableParam">
                     <thead>
                         <tr>
-                            <th width="88">申请时间</th>
-                            <th width="130">商家名称</th>
-                            <th width="80">订单号</th>
-                            <th width="105">可开票金额(￥)</th>
-                            <th width="55" class="select-line">
+                            <th width="100">申请时间</th>
+                            <th width="140">商家名称</th>
+                            <th width="190">订单号</th>
+                            <th width="120">可开票金额(￥)</th>
+                            <th width="60" class="select-line">
                                 <select class="select-adder form-control" ng-model="invoiceType" ng-change="changeInvoiceType(invoiceType)">
                                     <option value="">类型</option>
                                     <option value="1206">普票</option>
                                     <option value="1205">专票</option>
                                 </select>
                             </th>
-                            <th width="100">发票抬头</th>
-                            <th width="50">收票人</th>
-                            <th width="55">联系电话</th>
-                            <th width="55">
+                            <th width="115">发票抬头</th>
+                            <th width="65">收票人</th>
+                            <th width="120">联系电话</th>
+                            <th width="90">
                                 <select class="select-adder form-control" style="width: 60px;" ng-model="status" ng-change="changeStatus(status)">
                                     <option value="">状态</option>
                                     <option value="101">待开票</option>
@@ -211,19 +215,22 @@
                     </thead>
                     <tbody>
                         <tr ng-repeat="item in billData">
-                            <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
-                            <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.sellername" target="_blank"></a></td>
+                            <td ng-bind="item.createTime | date : 'yyyy-MM-dd'" title="{{item.createTime | date : 'yyyy-MM-dd'}}"></td>
+                            <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.sellername" target="_blank" title="{{item.sellername}}"></a></td>
                             <td>
-                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" target="_blank" class="invoice-detail"></a>
+                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}"
+                                   ng-repeat="orderid in item.orderids.split(',')"
+                                   ng-bind="orderid"
+                                   title='{{orderid}}' target="_blank" class="invoice-detail"></a>
                             </td>
-                            <td ng-bind="item.price"></td>
+                            <td ng-bind="item.price" title="{{item.price}}"></td>
                             <td style="padding: 0;">
                                 <span ng-bind="item.invoicetype==1206?'普票':'专票'"></span>
                                 <b ng-click="lookInvoiceInfo(item)" class="invoice-info">开票信息</b>
                             </td>
-                            <td ng-bind="item.invoicetitle"></td>
-                            <td ng-bind="item.receiverName"></td>
-                            <td ng-bind="item.recTel"></td>
+                            <td ng-bind="item.invoicetitle" title="{{item.invoicetitle}}"></td>
+                            <td ng-bind="item.receiverName" title="{{item.receiverName}}"></td>
+                            <td ng-bind="item.recTel" title="{{item.recTel}}"></td>
                             <td>
                                 <span ng-bind="item.status==101?'待开票':'已开票'" ng-class="{'blue':item.status==101}"></span>
                             </td>

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

@@ -215,8 +215,8 @@ body div.ng-table-pager a.page-a {
     <div class="ticket_record oder">
         <div class="oder01">
             <ul>
-                <li ng-class="{'active': tab == 'buyer_invoice'}"><a ui-sref="buyer_invoice">开票信息</a></li>
-                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">未开票</a></li>
+                <li ng-class="{'active': tab == 'buyer_invoice'}"><a ui-sref="buyer_invoice">发票信息</a></li>
+                <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">待开票订单</a></li>
                 <li ng-class="{'active': tab == 'buyer_invoice-record'}"><a ui-sref="buyer_invoice-record">开票记录</a></li>
             </ul>
         </div>

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

@@ -15,6 +15,9 @@
 
 	.oder .oder_list dl span.wd03{
 		width: 12%;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
 	.oder .oder_list dl span{
 		width: 16%;

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

@@ -61,11 +61,11 @@
         text-align: center;
     }
     .invoice-com-tab tbody>tr>td a.link-order{
-        cursor: default;
         display: block;
+        cursor: pointer;
     }
     .invoice-com-tab tbody>tr>td:hover a.link-order{
-        color: #666;
+        color: #5078cb;
     }
     .invoice-com-tab tbody>tr:hover>td b.invoice-info{
         display: block;
@@ -304,7 +304,7 @@
     <div class="count_center">
         <div class="com_tab">
             <ul class="fl">
-                <li ng-class="{'active': active == 'apply_invoice'}" ng-click="toggleTab('apply_invoice')"><a>开票申请</a></li>
+                <li ng-class="{'active': active == 'apply_invoice'}" ng-click="toggleTab('apply_invoice')"><a>买家开票申请</a></li>
                 <li ng-class="{'active': active == 'apply_record'}" ng-click="toggleTab('apply_record')"><a>开票记录</a></li>
             </ul>
         </div>
@@ -359,8 +359,9 @@
                         </td>
                         <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
                         <td>
-                            <!--<a ng-href="vendor#/purchase/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid"></a>-->
-                            <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" class="link-order"></a>
+                             <span ng-repeat="(col, orderid) in item.orderids.split(',')">
+                            <a ng-href="vendor#/purchase/detail/{{item.purchaseids.split(',')[col] | EncryptionFilter}}" ng-bind="orderid" target="_blank" class="link-order"></a>
+                        </span>
                         </td>
                         <td ng-bind="item.price"></td>
                         <td style="padding: 0;">
@@ -424,8 +425,9 @@
                 <tr ng-repeat="item in billData track by $index">
                     <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
                     <td>
-                        <!--<a ng-href="vendor#/purchase/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" target="_blank"></a>-->
-                        <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" class="link-order"></a>
+                        <span ng-repeat="(col, orderid) in item.orderids.split(',')">
+                            <a ng-href="vendor#/purchase/detail/{{item.purchaseids.split(',')[col] | EncryptionFilter}}" ng-bind="orderid" target="_blank" class="link-order"></a>
+                        </span>
                     </td>
                     <td ng-bind="item.price"></td>
                     <td style="padding: 0;">

src/main/webapp/resources/view/vendor/modal/invoice_look_modal.html

@@ -59,9 +59,9 @@
   .modal-body .item-list:first-child a:hover {
     color: #5078cb;
   }
-  .modal-body .item-list:first-child a.noOrder:hover{
-    color: #333;
-  }
+  /*.modal-body .item-list:first-child a.noOrder:hover{*/
+    /*color: #333;*/
+  /*}*/
   .modal-body .item-list:first-child a:nth-child(odd){
     margin-right: 22px;
   }
@@ -110,7 +110,9 @@
     <span>订单号：</span>
     <span>
       <a ng-if="isUserCenter" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in chooseInvoice.orderids.split(',')" ng-bind="orderid || '-'" target="_blank">965666768973953454654</a>
-      <a ng-if="!isUserCenter" ng-repeat="orderid in chooseInvoice.orderids.split(',')" ng-bind="orderid || '-'" style="cursor: default;" class="noOrder">965666768973953454654</a>
+       <span ng-repeat="(col, orderid) in chooseInvoice.orderids.split(',')">
+         <a ng-href="vendor#/purchase/detail/{{chooseInvoice.purchaseids.split(',')[col] | EncryptionFilter}}" ng-bind="orderid" target="_blank" class="link-order"></a>
+       </span>
     </span>
   </div>
   <div class="item-list">