PC显示发票信息问题处理,结算页面商品宽度调整,后台发票开具条件增加已发货可以开具发票的按钮

master
Chopper 2021-10-26 10:38:41 +08:00
parent 0d1dbd0350
commit f7f836f5fd
3 changed files with 19 additions and 12 deletions

View File

@ -38,10 +38,10 @@
</div> </div>
<div class="order-card"> <div class="order-card">
<h3>发票信息</h3> <h3>发票信息</h3>
<template v-if="order.order.receipt"> <template v-if="order.receipt">
<p>发票抬头{{order.order.receiptVO.receiptTitle}}</p> <p>发票抬头{{order.receipt.receiptTitle}}</p>
<p>发票内容{{order.order.receiptVO.receiptContent}}</p> <p>发票内容{{order.receipt.receiptContent}}</p>
<p v-if="order.order.receiptVO.taxpayerId">{{order.order.receiptVO.taxpayerId}}</p> <p v-if="order.receipt.taxpayerId">{{order.receipt.taxpayerId}}</p>
</template> </template>
<div v-else style="color:#999;margin-left:5px"> <div v-else style="color:#999;margin-left:5px">
未开发票 未开发票

View File

@ -569,6 +569,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "../../assets/styles/coupon.scss"; @import "../../assets/styles/coupon.scss";
.goods-msg{
overflow: hidden;
}
/** logo start */ /** logo start */
.logo { .logo {
height: 40px; height: 40px;
@ -772,6 +775,7 @@ export default {
} }
.goods-list { .goods-list {
width: 1150px;
background-color: #f8f8f8; background-color: #f8f8f8;
margin: 10px 0 20px 0; margin: 10px 0 20px 0;
@ -897,6 +901,7 @@ export default {
/** content end */ /** content end */
/** 底部支付栏 */ /** 底部支付栏 */
.order-footer { .order-footer {
z-index: 20;
height: 50px; height: 50px;
@include background_color($light_white_background_color); @include background_color($light_white_background_color);
@include title_color($title_color); @include title_color($title_color);

View File

@ -85,7 +85,7 @@ export default {
{ {
title: "发票内容", title: "发票内容",
key: "receiptContent", key: "receiptContent",
minWidth: 120, minWidth: 90,
tooltip: true, tooltip: true,
render: (h, params) => { render: (h, params) => {
return h("div", params.row.receiptContent || "暂未填写"); return h("div", params.row.receiptContent || "暂未填写");
@ -172,10 +172,12 @@ export default {
}, },
attrs: { attrs: {
disabled: disabled:
params.row.orderStatus == "COMPLETED" && !(
params.row.receiptStatus == 0 (params.row.orderStatus === "COMPLETED"
? false ||params.row.orderStatus === "DELIVERED")
: true,
&&
params.row.receiptStatus === 0),
}, },
style: { style: {
marginRight: "5px", marginRight: "5px",