|
|
@@ -51,7 +51,7 @@
|
|
|
>
|
|
|
提交
|
|
|
</el-link> -->
|
|
|
- <!-- <el-link
|
|
|
+ <el-link
|
|
|
type="primary"
|
|
|
:underline="false"
|
|
|
icon="el-icon-plus"
|
|
|
@@ -59,7 +59,7 @@
|
|
|
v-if="canAddInvoice(row)"
|
|
|
>
|
|
|
新增发票
|
|
|
- </el-link> -->
|
|
|
+ </el-link>
|
|
|
</template>
|
|
|
<!-- 收款信息 -->
|
|
|
<template v-slot:code="{ row }">
|
|
|
@@ -110,13 +110,13 @@
|
|
|
@reload="reload"
|
|
|
></process-submit-dialog>
|
|
|
<!-- 开票 -->
|
|
|
- <!-- <addOrEditDialogNew
|
|
|
+ <addOrEditDialogNew
|
|
|
ref="addOrEditDialogNewRef"
|
|
|
:add-or-edit-dialog-flag.sync="addOrEditDialogNewFlag"
|
|
|
v-if="addOrEditDialogNewFlag"
|
|
|
:isEditType="false"
|
|
|
@reload="reload"
|
|
|
- /> -->
|
|
|
+ />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -132,7 +132,7 @@
|
|
|
import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
import { shippingModeOp, transactionMethodsOp, paymentTypeOp, paymentStatus, invoiceStatusOp } from '@/enum/dict.js';
|
|
|
-// import addOrEditDialogNew from '@/views/financialManage/invoiceManage/components/addOrEditDialogNew.vue'
|
|
|
+ import addOrEditDialogNew from '@/views/financialManage/invoiceManage/components/addOrEditDialogNew.vue'
|
|
|
|
|
|
export default {
|
|
|
mixins: [dictMixins,tabMixins],
|
|
|
@@ -142,7 +142,7 @@
|
|
|
detailDialog,
|
|
|
invoiceDetailDialog,
|
|
|
processSubmitDialog,
|
|
|
- // addOrEditDialogNew
|
|
|
+ addOrEditDialogNew
|
|
|
},
|
|
|
//客户管理数据
|
|
|
props: {
|
|
|
@@ -210,6 +210,14 @@
|
|
|
columnKey: 'index',
|
|
|
align: 'center'
|
|
|
},
|
|
|
+ {
|
|
|
+ minWidth: 150,
|
|
|
+ prop: 'detailCode',
|
|
|
+ label: '已收编码',
|
|
|
+ align: 'center',
|
|
|
+ slot: 'detailCode',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
{
|
|
|
minWidth: 150,
|
|
|
prop: 'code',
|
|
|
@@ -431,16 +439,16 @@
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- // {
|
|
|
- // columnKey: 'action',
|
|
|
- // label: '操作',
|
|
|
- // width: 150,
|
|
|
- // align: 'center',
|
|
|
- // resizable: false,
|
|
|
- // slot: 'action',
|
|
|
- // showOverflowTooltip: true,
|
|
|
- // fixed: 'right'
|
|
|
- // }
|
|
|
+ {
|
|
|
+ columnKey: 'action',
|
|
|
+ label: '操作',
|
|
|
+ width: 150,
|
|
|
+ align: 'center',
|
|
|
+ resizable: false,
|
|
|
+ slot: 'action',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ fixed: 'right'
|
|
|
+ }
|
|
|
];
|
|
|
},
|
|
|
canAddInvoice() {
|
|
|
@@ -507,6 +515,7 @@
|
|
|
where['saleOrderCode'] = this.saleOrderData.orderNo;
|
|
|
}
|
|
|
return finReceivablePageListAPI({
|
|
|
+ receiptStatus: 1,
|
|
|
pageNum: page,
|
|
|
size: limit,
|
|
|
...where
|