mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：财务模块数据列表调整

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-03-05 17:54:06 +08:00
parent aff3016e4f
commit 4b8cd8b9e8
13 changed files with 180 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
oms_web/oms_vue/src/views/finance/invoice/index.vue
View File

@ -128,56 +128,56 @@
<el-table v-loading="loading" :data="invoiceList"> <el-table v-loading="loading" :data="invoiceList">
<el-table-column label="销售-开票单编号" align="center" prop="invoiceBillCode" width="200"/> <el-table-column label="销售-开票单编号" align="center" prop="invoiceBillCode" width="200"/>
<el-table-column label="预计开票时间" align="center" prop="invoiceTime" width="180"> <el-table-column label="预计开票时间" align="center" prop="invoiceTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.invoiceTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.invoiceTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="进货商名称" align="center" prop="partnerName" width="300" /> <el-table-column label="进货商名称" align="center" prop="partnerName" width="300" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" > <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span> <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" width="180"> <el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span> <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票未税总价(元)" align="center" prop="invoicePriceWithoutTax" width="180"> <el-table-column label="发票未税总价(元)" align="center" prop="invoicePriceWithoutTax" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.invoicePriceWithoutTax) }}</span> <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.invoicePriceWithoutTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="税额(元)" align="center" prop="taxAmount" width="180"> <el-table-column label="税额(元)" align="center" prop="taxAmount" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.totalPriceWithoutTax)) }}</span> <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.totalPriceWithoutTax)) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票税额(元)" align="center" prop="invoicePriceTax" width="180"> <el-table-column label="发票税额(元)" align="center" prop="invoicePriceTax" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicePriceWithoutTax)) }}</span> <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicePriceWithoutTax)) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开票状态" align="center" prop="invoiceStatus" width="150" > <el-table-column label="开票状态" align="center" prop="invoiceStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.invoice_bill_status" :value="scope.row.invoiceStatus"/> <dict-tag :options="dict.type.invoice_bill_status" :value="scope.row.invoiceStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" width="150" > <el-table-column label="审批状态" align="center" prop="approveStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/> <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批通过时间" align="center" prop="approveTime" width="180" > <el-table-column label="审批通过时间" align="center" prop="approveTime" width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.approveTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批节点" align="center" prop="approveNode" width="200" fixed="right"/> <el-table-column label="审批节点" align="center" prop="approveNode" width="100" fixed="right"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -391,6 +391,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("撤销成功"); this.$modal.msgSuccess("撤销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

11
oms_web/oms_vue/src/views/finance/payable/index.vue
View File

@ -128,9 +128,9 @@
<el-table-column label="项目名称" align="center" prop="projectName" width="260" /> <el-table-column label="项目名称" align="center" prop="projectName" width="260" />
<el-table-column label="采购-应付单编号" align="center" prop="payableBillCode" width="150" /> <el-table-column label="采购-应付单编号" align="center" prop="payableBillCode" width="150" />
<!-- <el-table-column label="生成时间" align="center" prop="createTime" width="180"/>--> <!-- <el-table-column label="生成时间" align="center" prop="createTime" width="180"/>-->
<el-table-column label="预计付款时间" align="center" prop="planPaymentDate" width="180"> <el-table-column label="预计付款时间" align="center" prop="planPaymentDate" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="getPaymentDateStyle(scope.row.planPaymentDate)">{{ scope.row.planPaymentDate }}</span> <span :style="getPaymentDateStyle(scope.row.planPaymentDate)">{{ timeProcessing(scope.row.planPaymentDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计付款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="预计付款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
@ -140,7 +140,7 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="预付金额" align="center" prop="advancePaymentAmount" width="120" />--> <!-- <el-table-column label="预付金额" align="center" prop="advancePaymentAmount" width="120" />-->
<el-table-column label="制造商名称" align="center" prop="vendorName" width="150" /> <el-table-column label="制造商名称" align="center" prop="vendorName" width="120" />
<!-- <el-table-column label="合同编号" align="center" prop="orderCode" width="150" />--> <!-- <el-table-column label="合同编号" align="center" prop="orderCode" width="150" />-->
<!-- <el-table-column label="出入库单号" align="center" prop="inventoryCode" width="150" />--> <!-- <el-table-column label="出入库单号" align="center" prop="inventoryCode" width="150" />-->
<el-table-column label="产品类型" align="center" prop="productType" width="120"> <el-table-column label="产品类型" align="center" prop="productType" width="120">
@ -436,6 +436,11 @@ export default {
return { color: '#ffba00' }; return { color: '#ffba00' };
} }
return {}; return {};
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

73
oms_web/oms_vue/src/views/finance/payment/index.vue
View File

@ -154,13 +154,13 @@
<a @click="handleDetail(scope.row)" class="link-type">{{ scope.row.paymentBillCode }}</a> <a @click="handleDetail(scope.row)" class="link-type">{{ scope.row.paymentBillCode }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计付款时间" align="center" prop="paymentTime" width="180"> <el-table-column label="预计付款时间" align="center" prop="paymentTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.paymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.paymentTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="制造商名称" width="200" align="center" prop="vendorName"/> <el-table-column label="制造商名称" width="120" align="center" prop="vendorName"/>
<el-table-column label="含税总价(元)" align="center" width="200" prop="totalPriceWithTax"> <el-table-column label="含税总价(元)" align="center" width="120" prop="totalPriceWithTax">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span> <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template> </template>
@ -171,12 +171,12 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="预付单剩余额度" align="center" width="200" prop="preResidueAmount"/>--> <!-- <el-table-column label="预付单剩余额度" align="center" width="200" prop="preResidueAmount"/>-->
<el-table-column label="实际付款时间" align="center" prop="actualPaymentTime" width="180"> <el-table-column label="实际付款时间" align="center" prop="actualPaymentTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.actualPaymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.actualPaymentTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付方式" align="center" width="100" prop="paymentMethod"> <el-table-column label="支付方式" align="center" width="150" prop="paymentMethod">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.payment_method" :value="scope.row.paymentMethod"/> <dict-tag :options="dict.type.payment_method" :value="scope.row.paymentMethod"/>
</template> </template>
@ -191,13 +191,13 @@
<dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/> <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批通过时间" align="center" prop="approveTime" width="180"> <el-table-column label="审批通过时间" align="center" prop="approveTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.approveTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批节点" fixed="right" width="150" align="center" prop="approveNode"/> <el-table-column label="审批节点" fixed="right" width="80" align="center" prop="approveNode"/>
<el-table-column label="操作" fixed="right" width="400" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" fixed="right" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -495,32 +495,32 @@ export default {
this.$modal.msgSuccess("发起成功"); this.$modal.msgSuccess("发起成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 申请退款按钮操作 */ /** 申请退款按钮操作 */
handleApplyRefund(row) { handleApplyRefund(row) {
this.$modal.confirm('收款单退款申请，确认提交至财务审批吗？').then(() => { this.$modal.confirm('收款单退款申请，确认提交至财务审批吗？').then(() => {
return applyRefund(row.id); return applyRefund(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("申请退款成功");
}).catch(() => {});
},
handleDelete(id){
this.$modal.confirm('确认删除该笔预付单数据吗？').then(() => {
return deletePayment(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("申请退款成功");
}).catch(() => {});
},
handleDelete(id){
this.$modal.confirm('确认删除该笔预付单数据吗？').then(() => {
return deletePayment(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
handleRevoke(row) {
let msg=row.paymentBillType==='REFUND'?'是否将该笔采购-退款单撤销，将退款单撤销至付款单':'是否将该笔采购-付款单撤销，撤销至付款单未审批状态';
this.$modal.confirm(msg).then(() => {
return handleRevoke(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("撤销成功");
}).catch(() => {}); }).catch(() => {});
}, },
handleRevoke(row) {
let msg=row.paymentBillType==='REFUND'?'是否将该笔采购-退款单撤销，将退款单撤销至付款单':'是否将该笔采购-付款单撤销，撤销至付款单未审批状态';
this.$modal.confirm(msg).then(() => {
return handleRevoke(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("撤销成功");
}).catch(() => {});
},
getSummaries(param) { getSummaries(param) {
const { columns, data } = param; const { columns, data } = param;
const sums = []; const sums = [];
@ -549,6 +549,11 @@ export default {
} }
}); });
return sums; return sums;
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

29
oms_web/oms_vue/src/views/finance/receipt/index.vue
View File

@ -128,29 +128,29 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="receiptList" show-summary :summary-method="getSummaries"> <el-table v-loading="loading" :data="receiptList" show-summary :summary-method="getSummaries">
<el-table-column label="采购-收票单编号" align="center" prop="ticketBillCode" /> <el-table-column label="采购-收票单编号" align="center" prop="ticketBillCode" width="180" />
<!-- <el-table-column label="预计收票时间" align="center" prop="ticketTime" width="180">--> <!-- <el-table-column label="预计收票时间" align="center" prop="ticketTime" width="180">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.ticketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>--> <!-- <span>{{ parseTime(scope.row.ticketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="制造商开票时间" align="center" prop="vendorTicketTime" width="180"> <el-table-column label="制造商开票时间" align="center" prop="vendorTicketTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.vendorTicketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.vendorTicketTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="制造商名称" align="center" prop="vendorName" /> <el-table-column label="制造商名称" align="center" prop="vendorName" width="120" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" > <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span> <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" > <el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span> <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="税额(元)" align="center" prop="taxAmount" > <el-table-column label="税额(元)" align="center" prop="taxAmount" width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ formatCurrency(scope.row.taxAmount) }}</span> <span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ formatCurrency(scope.row.taxAmount) }}</span>
</template> </template>
@ -160,7 +160,7 @@
<!-- <dict-tag :options="dict.type.ticket_bill_type" :value="scope.row.ticketBillType"/>--> <!-- <dict-tag :options="dict.type.ticket_bill_type" :value="scope.row.ticketBillType"/>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="收票状态" align="center" prop="ticketStatus" > <el-table-column label="收票状态" align="center" prop="ticketStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.receipt_status" :value="scope.row.ticketStatus"/> <dict-tag :options="dict.type.receipt_status" :value="scope.row.ticketStatus"/>
</template> </template>
@ -171,17 +171,17 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="审批状态" align="center" prop="approveStatus" > <el-table-column label="审批状态" align="center" prop="approveStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/> <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批通过时间" align="center" prop="approveTime" width="180"> <el-table-column label="审批通过时间" align="center" prop="approveTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.approveTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批节点" align="center" prop="approveNode" /> <el-table-column label="审批节点" align="center" prop="approveNode" width="100" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -425,6 +425,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("撤销成功"); this.$modal.msgSuccess("撤销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

15
oms_web/oms_vue/src/views/finance/receivable/index.vue
View File

@ -98,9 +98,13 @@
<el-table v-loading="loading" :data="receivableList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="receivableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" /> <el-table-column type="selection" width="50" />
<!-- <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />--> <!-- <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />-->
<el-table-column label="项目名称" align="center" prop="projectName" width="240" /> <el-table-column label="项目名称" align="center" prop="projectName" width="200" />
<el-table-column label="销售-应收单编号" align="center" prop="receivableBillCode" width="150" /> <el-table-column label="销售-应收单编号" align="center" prop="receivableBillCode" width="150" />
<el-table-column label="预计收款时间" align="center" prop="planReceiptDate" width="180"/> <el-table-column label="预计收款时间" align="center" prop="planReceiptDate" width="120">
<template slot-scope="scope">
<span>{{ timeProcessing(scope.row.planReceiptDate) }}</span>
</template>
</el-table-column>
<el-table-column label="预计收款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="预计收款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="该进货商是否有预收单" align="center" prop="hasAdvanceReceipt" width="150" > <el-table-column label="该进货商是否有预收单" align="center" prop="hasAdvanceReceipt" width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -116,7 +120,7 @@
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款金额" align="center" prop="unreceivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="未收款金额" align="center" prop="unreceivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" /> <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -318,6 +322,11 @@ export default {
this.isMergeInvoiceDialogOpen = false; this.isMergeInvoiceDialogOpen = false;
this.getList(); // Refresh the list this.getList(); // Refresh the list
}); });
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

27
oms_web/oms_vue/src/views/finance/receive/index.vue
View File

@ -124,40 +124,40 @@
<el-table v-loading="loading" :data="receiveList"> <el-table v-loading="loading" :data="receiveList">
<el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="180" /> <el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="180" />
<el-table-column label="预计收款时间" align="center" prop="receiptTime" width="180"> <el-table-column label="预计收款时间" align="center" prop="receiptTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.receiptTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="进货商名称" align="center" prop="partnerName" width="230" /> <el-table-column label="进货商名称" align="center" prop="partnerName" width="230" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" > <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
<span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }} </span></span> <span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }} </span></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="receiptBillType" width="180"> <el-table-column label="备注" align="center" prop="receiptBillType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.receipt_bill_type" :value="scope.row.receiptBillType"/> <dict-tag :options="dict.type.receipt_bill_type" :value="scope.row.receiptBillType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="180" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="140" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款状态" align="center" prop="receiveStatus" width="180"> <el-table-column label="收款状态" align="center" prop="receiveStatus" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.receipt_bill_status" :value="scope.row.receiptStatus"/> <dict-tag :options="dict.type.receipt_bill_status" :value="scope.row.receiptStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" width="180"> <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/> <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批通过时间" align="center" prop="approveTime" width="180"> <el-table-column label="审批通过时间" align="center" prop="approveTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.approveTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批节点" align="center" prop="approveNode" width="200" fixed="right" /> <el-table-column label="审批节点" align="center" prop="approveNode" width="100" fixed="right" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -396,6 +396,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("退回成功"); this.$modal.msgSuccess("退回成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

25
oms_web/oms_vue/src/views/finance/writeoff/invoice/writeoffRecord.vue
View File

@ -76,28 +76,28 @@
<el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id"> <el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="核销序号" align="center" prop="writeOffCode" /> <el-table-column label="核销序号" align="center" prop="writeOffCode" width="160" />
<el-table-column label="核销人" align="center" prop="createByName" > <el-table-column label="核销人" align="center" prop="createByName" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createByName || '-' }}</span> <span>{{ scope.row.createByName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="核销时间" align="center" prop="createTime" width="180"> <el-table-column label="核销时间" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售开票单编号" align="center" prop="invoiceBillCode" /> <el-table-column label="销售开票单编号" align="center" prop="invoiceBillCode" width="160" />
<el-table-column label="代理商名称" align="center" prop="partnerName" /> <el-table-column label="代理商名称" align="center" prop="partnerName" />
<el-table-column label="核销类型" align="center" prop="writeOffType"> <el-table-column label="核销类型" align="center" prop="writeOffType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/> <dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="核销含税总价(元)" align="center" width="140" prop="writeOffAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" /> <el-table-column label="核销未税总价(元)" align="center" width="140" prop="writeOffAmountWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="核销税额(元)" align="center" width="140" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -232,6 +232,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("反核销成功"); this.$modal.msgSuccess("反核销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

17
oms_web/oms_vue/src/views/finance/writeoff/payment/index.vue
View File

@ -142,13 +142,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="150" <el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="130"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="采购应付单编号" fixed="right" align="center" prop="payableBillCode" width="150" <el-table-column label="采购应付单编号" fixed="right" align="center" prop="payableBillCode" width="150"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="生成时间" fixed="right" align="center" prop="createTime" width="160"> <el-table-column label="生成时间" fixed="right" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -204,13 +204,13 @@
<el-table-column label="已核销税额(元)" align="center" width="150" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="已核销税额(元)" align="center" width="150" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/> <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="150" <el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="130"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="采购付款单号" fixed="right" align="center" prop="paymentBillCode" width="150" <el-table-column label="采购付款单号" fixed="right" align="center" prop="paymentBillCode" width="150"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="生成时间" fixed="right" align="center" prop="createTime" width="160"> <el-table-column label="生成时间" fixed="right" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -552,6 +552,11 @@ export default {
this.$modal.msgSuccess("核销成功"); this.$modal.msgSuccess("核销成功");
this.handleQuery(); this.handleQuery();
}); });
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

9
oms_web/oms_vue/src/views/finance/writeoff/payment/writeoffRecord.vue
View File

@ -80,9 +80,9 @@
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="核销序号" align="center" prop="writeOffCode" /> <el-table-column label="核销序号" align="center" prop="writeOffCode" />
<el-table-column label="核销人" align="center" prop="createByName" /> <el-table-column label="核销人" align="center" prop="createByName" />
<el-table-column label="核销时间" align="center" prop="createTime" width="180"> <el-table-column label="核销时间" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购付款单编号" align="center" prop="paymentBillCode" /> <el-table-column label="采购付款单编号" align="center" prop="paymentBillCode" />
@ -230,6 +230,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("反核销成功"); this.$modal.msgSuccess("反核销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

13
oms_web/oms_vue/src/views/finance/writeoff/receipt/index.vue
View File

@ -134,9 +134,9 @@
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="销售-应收单编号" fixed="right" align="center" prop="receivableBillCode" width="150" <el-table-column label="销售-应收单编号" fixed="right" align="center" prop="receivableBillCode" width="150"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="应收单生成时间" fixed="right" align="center" prop="createTime" width="160"> <el-table-column label="应收单生成时间" fixed="right" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -196,9 +196,9 @@
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="150" <el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="150"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column label="收款单生成时间" align="center" prop="createTime" width="160"> <el-table-column label="收款单生成时间" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" width="80"></el-table-column> <el-table-column label="备注" align="center" width="80"></el-table-column>
@ -543,6 +543,11 @@ export default {
this.$modal.msgSuccess("核销成功"); this.$modal.msgSuccess("核销成功");
this.handleQuery(); this.handleQuery();
}); });
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

25
oms_web/oms_vue/src/views/finance/writeoff/receipt/writeoffRecord.vue
View File

@ -75,24 +75,24 @@
<el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id"> <el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="核销序号" align="center" prop="writeOffCode" /> <el-table-column label="核销序号" align="center" prop="writeOffCode" width="180" />
<el-table-column label="核销人" align="center" prop="createByName" /> <el-table-column label="核销人" align="center" prop="createByName" width="100" />
<el-table-column label="核销时间" align="center" prop="createTime" width="180"> <el-table-column label="核销时间" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" /> <el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="180" />
<el-table-column label="进货商名称" align="center" prop="partnerName" /> <el-table-column label="进货商名称" align="center" prop="partnerName" />
<el-table-column label="核销类型" align="center" prop="writeOffType"> <el-table-column label="核销类型" align="center" prop="writeOffType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/> <dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" /> <el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" width="140" />
<el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" /> <el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" width="140" />
<el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" /> <el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" width="140" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -222,6 +222,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("反核销成功"); this.$modal.msgSuccess("反核销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

19
oms_web/oms_vue/src/views/finance/writeoff/ticket/writeoffRecord.vue
View File

@ -76,16 +76,16 @@
<el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id"> <el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="核销序号" align="center" prop="writeOffCode" /> <el-table-column label="核销序号" align="center" prop="writeOffCode" width="180" />
<el-table-column label="核销人" align="center" prop="createByName" /> <el-table-column label="核销人" align="center" prop="createByName" width="100" />
<el-table-column label="核销时间" align="center" prop="createTime" width="180"> <el-table-column label="核销时间" align="center" prop="createTime" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ timeProcessing(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购收票单编号" align="center" prop="ticketBillCode" /> <el-table-column label="采购收票单编号" align="center" prop="ticketBillCode" width="180" />
<el-table-column label="制造商名称" align="center" prop="vendorName" /> <el-table-column label="制造商名称" align="center" prop="vendorName" width="130" />
<el-table-column label="核销类型" align="center" prop="writeOffType"> <el-table-column label="核销类型" align="center" prop="writeOffType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/> <dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
</template> </template>
@ -228,6 +228,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("反核销成功"); this.$modal.msgSuccess("反核销成功");
}).catch(() => {}); }).catch(() => {});
},
/** 时间处理 */
timeProcessing(value) {
if (value === null || value === undefined || value === '') return '';
return value.substring(0, 10);
} }
} }
}; };

2
oms_web/oms_vue/src/views/purchaseorder/index.vue
View File

@ -107,7 +107,7 @@
@sort-change="handleSortChange"> @sort-change="handleSortChange">
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="采购编号" align="center" prop="purchaseNo" width="180"/> <el-table-column label="采购编号" align="center" prop="purchaseNo" width="180"/>
<el-table-column label="制造商简称" align="center" prop="vendorName" width="120"/> <el-table-column label="制造商" align="center" prop="vendorName" width="120"/>
<el-table-column label="产品编码" align="center" width="110"> <el-table-column label="产品编码" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.omsPurchaseOrderItemList && scope.row.omsPurchaseOrderItemList.length > 0"> <div v-if="scope.row.omsPurchaseOrderItemList && scope.row.omsPurchaseOrderItemList.length > 0">