Authored by yyq

Merge branch 'feature/homeInvoice' into release/6.1

@@ -383,6 +383,14 @@ module.exports = class extends global.yoho.BaseModel { @@ -383,6 +383,14 @@ module.exports = class extends global.yoho.BaseModel {
383 _.set(newOrder, 'invoiceOperation.invoiceSupplying', issueType === 1); 383 _.set(newOrder, 'invoiceOperation.invoiceSupplying', issueType === 1);
384 } 384 }
385 385
  386 + if (+order.refund_status === 1 || +order.exchange_status === 1) {
  387 + Object.assign(newOrder, {
  388 + invoiceOperation: {unsupportSupply: true},
  389 + unsupportSupplyTip: +order.refund_status === 1 ?
  390 + '订单商品已申请退货,暂无发票信息' : '换货订单暂不支持补开发票'
  391 + });
  392 + }
  393 +
386 if (newOrder.issueType) { 394 if (newOrder.issueType) {
387 newOrder.invoiceType = _.get(order, 'invoice.type', 0) === 2 ? '电子发票' : '纸质发票'; 395 newOrder.invoiceType = _.get(order, 'invoice.type', 0) === 2 ? '电子发票' : '纸质发票';
388 } 396 }
@@ -25,6 +25,9 @@ @@ -25,6 +25,9 @@
25 <p class="order-title"> 25 <p class="order-title">
26 {{title}} 26 {{title}}
27 <span class="order-time">下单时间:{{orderTime}}</span> 27 <span class="order-time">下单时间:{{orderTime}}</span>
  28 + {{#if unsupportSupplyTip}}
  29 + <span class="right unsupport-tip"><i class="iconfont">&#xe6d6;</i>{{unsupportSupplyTip}}</span>
  30 + {{/if}}
28 </p> 31 </p>
29 <div class="order-wrap"> 32 <div class="order-wrap">
30 <ul> 33 <ul>
@@ -104,6 +107,10 @@ @@ -104,6 +107,10 @@
104 {{#if supplyInvoice}} 107 {{#if supplyInvoice}}
105 <span class="op-item supply-invoice" data-id="{{../orderNum}}">申请补开</span> 108 <span class="op-item supply-invoice" data-id="{{../orderNum}}">申请补开</span>
106 {{/if}} 109 {{/if}}
  110 +
  111 + {{#if unsupportSupply}}
  112 + <span class="op-item on-invoice" data-id="{{../orderNum}}">不支持补开</span>
  113 + {{/if}}
107 {{/ invoiceOperation}} 114 {{/ invoiceOperation}}
108 </div> 115 </div>
109 </div> 116 </div>
@@ -7,6 +7,19 @@ @@ -7,6 +7,19 @@
7 margin-bottom: 10px; 7 margin-bottom: 10px;
8 } 8 }
9 9
  10 + .order-title {
  11 + overflow: hidden;
  12 +
  13 + .unsupport-tip {
  14 + color: #999;
  15 +
  16 + .iconfont {
  17 + font-size: 14px;
  18 + margin: 0 4px;
  19 + }
  20 + }
  21 + }
  22 +
10 .operation { 23 .operation {
11 > .on-invoice { 24 > .on-invoice {
12 color: #999; 25 color: #999;