diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue index 4d5936f..0191007 100644 --- a/src/components/tools/StatusSlot.vue +++ b/src/components/tools/StatusSlot.vue @@ -145,12 +145,13 @@ export default { */ showTemplate(item) { let result = '' + console.log(item) // 来款 if(this.statusKey === 'paymentRecord') { result = `${item.paymentDate}到账${item.amountReceived}` - } else if(this.statusKey === 'mail') { - result = `${item.billDate}新增发票,发票单号:${item.billNo}` } else if(this.statusKey === 'bill') { + result = `${item.billDate}新增发票,发票单号:${item.billNo}` + } else if(this.statusKey === 'mail') { result = `${item.sendDate}新增邮寄信息,邮寄单号:${item.postNo}` } return result diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 671137c..3fd800e 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -82,6 +82,16 @@ + + + + + + @@ -232,13 +242,13 @@ export default { align: 'center', width: 70, dataIndex: 'makeInvoice', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-bill' } }, { title: '邮寄', align: 'center', width: 70, dataIndex: 'mail', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-mail' } }, { title: '操作', dataIndex: 'action', diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index b422bdd..14d16e3 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -82,6 +82,10 @@ @click="openDetailModal(record)"> + + 打印 @@ -98,9 +102,9 @@ diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue index f744efc..e42d0f5 100644 --- a/src/views/mailManagement/ContractMail.vue +++ b/src/views/mailManagement/ContractMail.vue @@ -64,13 +64,18 @@
+ + 打印 邮寄 修改 - 查看物流 + 查看物流 @@ -79,9 +84,9 @@ diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 69084b7..6566013 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -103,6 +103,16 @@ + + + + + + @@ -299,13 +309,13 @@ export default { align: 'center', width: 80, dataIndex: 'makeInvoice', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-bill' } }, { title: '邮寄', align: 'center', width: 80, dataIndex: 'mail', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-mail' } }, { title: '操作', dataIndex: 'action', diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue index 6dd4ec8..4d93ce8 100644 --- a/src/views/projectManagement/GeneralProjectManagement.vue +++ b/src/views/projectManagement/GeneralProjectManagement.vue @@ -23,7 +23,8 @@ - + @@ -62,18 +63,18 @@
+ ref="table" + size="middle" + bordered + rowKey="id" + :columns="columns" + :scroll="{x: 1000}" + :dataSource="dataSource" + :pagination="ipagination" + :loading="loading" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" + @change="handleTableChange" + class="j-table-force-nowrap"> + + + + + + - 编辑 - 删除 - + 编辑 + 删除 +
@@ -209,13 +220,13 @@ export default { align: 'center', width: 80, dataIndex: 'makeInvoice', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-bill' } }, { title: '邮寄', align: 'center', width: 80, dataIndex: 'mail', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-mail' } }, { title: '操作', dataIndex: 'action', diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 4fc2898..bfb56a2 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -116,6 +116,16 @@ + + + + + + @@ -286,13 +296,13 @@ export default { align: 'center', width: 80, dataIndex: 'makeInvoice', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-bill' } }, { title: '邮寄', align: 'center', width: 80, dataIndex: 'mail', - scopedSlots: { customRender: 'status' } + scopedSlots: { customRender: 'status-mail' } }, { title: '操作', dataIndex: 'action',