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

Compare commits

base: mula:e1643a633149a15c9799282eb532aa164a1a81be
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master
...
compare: mula:3951ef325d6540abc18e3eedca1cb0e49b1c3a60
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master

8 Commits
e1643a6331 ... 3951ef325d

Author SHA1 Message Date
wangy 3951ef325d Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.1 2026-02-04 09:24:12 +08:00
chenhao 45f69d527e feat(finance): 新增付款单附件功能并优化表格显示 
- 在新增付款单表单中添加附件上传组件
- 修改表格样式设置避免滚动条冲突
- 移除表格固定高度限制提升用户体验
- 在付款单详情页面显示附件信息
- 添加付款单删除功能支持预付款单删除
- 付款单编号列添加链接跳转至详情页
- 后端实体类和数据库映射增加文件ID字段
- 实现附件查询服务关联付款单数据
- 货币金额显示格式化为货币格式
- 文件上传组件集成到付款单流程中
 2026-01-29 17:14:42 +08:00
chenhao a56d750f2d feat(finance): 添加金额格式化显示功能并优化表单界面 
- 在多个财务模块的表格列中添加金额格式化显示功能
- 统一使用 formatCurrency 方法格式化含税总价、未开票金额等数值
- 在付款单新增表单中添加其它特别说明字段
- 调整表格最大高度以优化界面显示
- 在详情抽屉中统一应用金额格式化处理
- 修改数据默认值以避免空值错误
- 优化审批流程中的金额显示格式化
 2026-01-29 13:44:28 +08:00
chenhao 6bed84cf3e feat(delivery): 添加发货管理的数据权限控制功能 
- 在发货清单查询中集成数据权限注解支持
- 为发货服务类添加 DataScope 注解配置
- 更新 MyBatis 映射文件以支持数据权限 SQL 注入
- 添加用户职责关联查询以支持权限判断
- 修改前端组件移除不必要的自动加载逻辑
- 在用户控制器中增加角色授权接口实现
 2026-01-27 13:40:43 +08:00
chenhao 330f2f7d54 feat(project): 优化项目信息表格布局并添加导出功能 
- 调整表格列宽度以改善显示效果
- 在项目详情抽屉中添加技术方案终审下载按钮
- 实现导出单个项目技术方案的功能
- 移除原表格中的冗余导出按钮并改为注释形式
- 新增handleExportSingle方法处理文件导出逻辑
 2026-01-27 10:55:38 +08:00
chenhao b96d006f9c feat(approve): 添加产品编码和型号筛选功能并优化订单金额显示 
- 在审批订单页面添加产品编码和产品型号搜索条件
- 实现订单金额的货币格式化显示功能
- 添加格式化工具函数用于金额显示
- 修改订单总金额计算逻辑以支持不同订单状态
- 调整表格列布局以适应不同的订单状态显示需求
- 在采购审批相关页面添加产品筛选条件
- 更新后端实体类以支持产品编码和型号字段
- 优化库存发货服务中的代码格式和业务逻辑
- 添加年份计算的乘法逻辑用于服务期限计算
 2026-01-26 17:48:19 +08:00
chenhao baa4b52553 feat(purchaseorder): 添加采购单导出功能并优化界面显示 
- 在后端控制器中实现export方法返回AjaxResult并设置审批状态过滤
- 添加exportPurchaseorder API函数用于导出采购订单数据
- 在前端界面添加导出按钮及权限控制
- 修改下载插件中的方法名为download替代name
- 修复多个选择组件中的表单提交阻止默认行为
- 优化采购单详情对话框和抽屉组件的属性格式化
- 隐藏采购订单实体类中部分字段的Excel导出注解
- 修正审批时间Excel导出的时间格式化设置
- 更新多个select组件中的键盘事件处理方式
 2026-01-26 14:20:27 +08:00
chenhao dd2a7d99b6 fix(inventory): 解决导入SN数据时状态设置时机问题 
- 将isImported状态设置移到下一个DOM更新周期后执行
- 确保表格选择操作完成后再更新导入状态
- 避免因状态设置过早导致的UI更新异常
 2026-01-26 09:57:21 +08:00
95 changed files with 767 additions and 420 deletions
Show Stats Expand all files Collapse all files

18
oms_web/oms_vue/src/api/finance/payment.js
View File

@ -12,6 +12,16 @@ export function listPayment(query) {
data: tansParams(query)
})
}
export function exportPayment(query) {
return request({
url: '/finance/payment/export',
method: 'post',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
data: tansParams(query)
})
}
// 查询付款单详细
export function getPayment(id) {
@ -101,6 +111,14 @@ export function applyRefund(id) {
needLoading: true
})
}
export function deletePayment(id) {
return request({
url: '/finance/payment/remove',
method: 'post',
params:{ids:id},
needLoading: true
})
}
export function applyRefundApprove(id) {
return request({

10
oms_web/oms_vue/src/api/sip/purchaseorder.js
View File

@ -106,6 +106,16 @@ export function recallPurchaseorder(id) {
method: 'put'
})
}
export function exportPurchaseorder(data) {
return request({
url: '/sip/purchaseorder/export',
method: 'get',
params: data,
// headers: { 'Content-Type': 'multipart/form-data' },
needLoading: true
})
}
// 查询已审批采购单主表列表
export function listApprovedPurchaseorder(query) {

2
oms_web/oms_vue/src/main.js
View File

@ -21,6 +21,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"
import { getConfigKey } from "@/api/system/config"
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"
import { formatCurrency } from "@/utils"
// 分页组件
import Pagination from "@/components/Pagination"
// 自定义表格工具组件
@ -42,6 +43,7 @@ import DictData from '@/components/DictData'
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime
Vue.prototype.formatCurrency = formatCurrency
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel

3
oms_web/oms_vue/src/plugins/download.js
View File

@ -9,13 +9,12 @@ const baseURL = process.env.VUE_APP_BASE_API
let downloadLoadingInstance
export default {
name(name, isDelete = true) {
download(name, isDelete = true) {
var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then((res) => {
const isBlob = blobValidate(res.data)
if (isBlob) {

5
oms_web/oms_vue/src/utils/index.js
View File

@ -14,7 +14,10 @@ export function formatDate(cellValue) {
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
export function formatCurrency(value) {
if (value == null) return '0.00';
return Number(value).toLocaleString('en-US', {minimumFractionDigits: 2, maximumFractionDigits: 2});
}
/**
* @param {number} time
* @param {string} option

26
oms_web/oms_vue/src/views/approve/approved_order/index.vue
View File

@ -49,6 +49,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input
v-model="queryParams.productModel"
placeholder="请输入产品型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -72,7 +88,11 @@
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目编号" align="center" prop="projectCode" />
<el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column label="订单金额" align="center" prop="actualPurchaseAmount" />
<el-table-column label="订单金额" align="center" prop="actualPurchaseAmount" >
<template slot-scope="scope">
<span>{{ formatCurrency(scope.row.actualPurchaseAmount || scope.row.shipmentAmount) }}</span>
</template>
</el-table-column>
<el-table-column label="汇智负责人" align="center" prop="dutyName" />
<el-table-column label="审批节点" align="center" prop="approveNode">
<template slot-scope="scope">
@ -127,6 +147,7 @@
<script>
import { listOrder } from "@/api/approve/order/orderLog";
import ApproveDialog from '../order/Approve.vue';
import {formatCurrency} from "../../../utils";
export default {
name: "ApprovedOrder",
@ -153,6 +174,8 @@ export default {
orderCode: null,
projectName: null,
projectCode: null,
productCode: null,
productModel: null,
customerName: null,
dutyName: null,
approveNode: null,
@ -165,6 +188,7 @@ export default {
this.getList();
},
methods: {
formatCurrency,
/** 查询订单列表 */
getList() {
this.loading = true;

2
oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue
View File

@ -31,7 +31,7 @@
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column label="收票编号" align="center" prop="ticketBillCode" />
<el-table-column label="供应商" align="center" prop="vendorName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime) }}</span>

10
oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/components/InvoiceReceiptDetail.vue
View File

@ -7,9 +7,9 @@
<el-descriptions-item label="票据类型">
<dict-tag :options="dict.type.finance_invoice_type" :value="data.ticketType"/>
</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
<el-descriptions-item label="预计收票时间">{{ data.ticketTime }}</el-descriptions-item>
<el-descriptions-item label="制造商开票时间">{{ data.vendorTicketTime }}</el-descriptions-item>
<!-- <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
@ -26,8 +26,8 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
<el-table-column prop="paymentAmount" label="本次收票金额" align="center"></el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="paymentAmount" label="本次收票金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
</el-table>
</div>

2
oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue
View File

@ -44,7 +44,7 @@
<el-table-column label="收票编号" align="center" prop="ticketBillCode" />
<el-table-column label="制造商" align="center" prop="vendorName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="登记人" align="center" prop="createUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

2
oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="收票编号" align="center" prop="ticketBillCode" />
<el-table-column label="供应商" align="center" prop="vendorName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime) }}</span>

10
oms_web/oms_vue/src/views/approve/finance/invoiceRed/components/InvoiceRedDetail.vue
View File

@ -7,9 +7,9 @@
<el-descriptions-item label="票据类型">
<dict-tag :options="dict.type.finance_invoice_type" :value="data.ticketType"/>
</el-descriptions-item>
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }} </span></el-descriptions-item>
<el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
<el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }} </span></el-descriptions-item>
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }} </span></el-descriptions-item>
<el-descriptions-item label="未税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }}</span></el-descriptions-item>
<el-descriptions-item label="税额(元)"><span style="color: red">{{ formatCurrency(data.taxAmount) }} </span></el-descriptions-item>
<el-descriptions-item label="收票时间">{{ data.ticketTime }}</el-descriptions-item>
<el-descriptions-item label="制造商开票时间">{{ data.vendorTicketTime }}</el-descriptions-item>
<!-- <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
@ -26,8 +26,8 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
<el-table-column prop="paymentAmount" label="本次红冲金额" align="center"></el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="paymentAmount" label="本次红冲金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
</el-table>
</div>

6
oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue
View File

@ -44,10 +44,8 @@
<el-table-column label="收票编号" align="center" prop="ticketBillCode" />
<el-table-column label="供应商" align="center" prop="vendorName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" >
<template slot-scope="scope">
<span style="color: red">{{ scope.row.totalPriceWithTax }}</span>
</template>
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)">
</el-table-column>
<!-- <el-table-column label="登记人" align="center" prop="createUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">

2
oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="付款编号" align="center" prop="paymentBillCode" />
<el-table-column label="制造商" align="center" prop="vendorName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

13
oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
View File

@ -10,9 +10,9 @@
<el-descriptions-item label="付款周期">
{{data.payConfigDay}}天
</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
<!-- <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>-->
<el-descriptions-item label="支付方式">
<dict-tag :options="dict.type.payment_method" :value="data.paymentMethod"/>
</el-descriptions-item>
@ -20,10 +20,11 @@
<el-descriptions-item label="账户名称">{{ data.payName }}</el-descriptions-item>
<el-descriptions-item label="银行开户行">{{ data.payBankOpenAddress }}</el-descriptions-item>
<el-descriptions-item label="银行行号">{{ data.bankNumber }}</el-descriptions-item>
<!-- <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
<el-descriptions-item span="2"></el-descriptions-item>
<el-descriptions-item label="其它特别说明" :span="3">{{ data.remark }}</el-descriptions-item>
</el-descriptions>
<div class="section" style="margin-top: 20px;" v-show="data.payableDetails && data.payableDetails.length>0">
<div class="section" style="margin-top: 20px;" >
<div class="el-descriptions__title">应付单信息</div>
<el-table :data="data.payableDetails" border style="width: 100%; margin-top: 10px;">
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
@ -67,6 +68,7 @@
<script>
import request from '@/utils/request';
import {formatCurrency} from "@/utils";
export default {
name: "PaymentDetail",
@ -91,6 +93,7 @@ export default {
},
methods: {
formatCurrency,
isPdf(filePath) {
return filePath && filePath.toLowerCase().endsWith('.pdf');

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

@ -44,7 +44,7 @@
<el-table-column label="付款编号" align="center" prop="paymentBillCode" />
<el-table-column label="制造商" align="center" prop="vendorName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

2
oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
View File

@ -34,7 +34,7 @@
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" >
<template slot-scope="scope">
<span style="color: red">{{ scope.row.totalPriceWithTax }}</span>
<span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->

16
oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
View File

@ -10,20 +10,21 @@
<el-descriptions-item label="付款周期">
{{data.payConfigDay}}天
</el-descriptions-item>
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
<el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>
<el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }}</span></el-descriptions-item>
<!-- <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>-->
<!-- <el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>-->
<el-descriptions-item label="支付方式">
<dict-tag :options="dict.type.payment_method" :value="data.paymentMethod"/>
</el-descriptions-item>
<el-descriptions-item label="银行账号">{{ data.payBankNumber }}</el-descriptions-item>
<el-descriptions-item label="账户名称">{{ data.payName }}</el-descriptions-item>
<el-descriptions-item label="银行开户行">{{ data.payBankOpenAddress }}</el-descriptions-item>
<el-descriptions-item label="银行行号">{{ data.bankNumber }}</el-descriptions-item>
<!-- <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
<el-descriptions-item label="银行行号" span="1">{{ data.bankNumber }}</el-descriptions-item>
<el-descriptions-item span="2"></el-descriptions-item>
<el-descriptions-item label="其它特别说明" span="3">{{ data.remark }}</el-descriptions-item>
</el-descriptions>
<div class="section" style="margin-top: 20px;" v-show="data.payableDetails && data.payableDetails.length>0">
<div class="section" style="margin-top: 20px;" >
<div class="el-descriptions__title">应付单信息</div>
<el-table :data="data.payableDetails" border style="width: 100%; margin-top: 10px;">
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
@ -43,8 +44,11 @@
</template>
<script>
import {formatCurrency} from "@/utils";
export default {
name: "PaymentRefundDetail",
methods: {formatCurrency},
props: {
data: {
type: Object,

2
oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
View File

@ -46,7 +46,7 @@
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" >
<template slot-scope="scope">
<span style="color: red">{{ scope.row.totalPriceWithTax }}</span>
<span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->

2
oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="收款编号" align="center" prop="receiptBillCode" />
<el-table-column label="客户" align="center" prop="partnerName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

10
oms_web/oms_vue/src/views/approve/finance/receipt/components/ReceiptDetail.vue
View File

@ -7,9 +7,9 @@
<!-- <el-descriptions-item label="收款单类型">-->
<!-- <dict-tag :options="dict.type.receipt_bill_type" :value="data.receiptBillType"/>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
<el-descriptions-item label="支付方式">
<dict-tag :options="dict.type.payment_method" :value="data.receiptMethod"/>
</el-descriptions-item>
@ -31,8 +31,8 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
<el-table-column prop="receiptAmount" label="本次收款金额" align="center"></el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="receiptAmount" label="本次收款金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
</el-table>
</div>

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

@ -44,7 +44,7 @@
<el-table-column label="收款编号" align="center" prop="receiptBillCode" />
<el-table-column label="进货商" align="center" prop="partnerName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

2
oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="收款编号" align="center" prop="receiptBillCode" />
<el-table-column label="客户" align="center" prop="partnerName" />
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">

6
oms_web/oms_vue/src/views/approve/finance/receiptRefound/components/ReceiptDetail.vue
View File

@ -7,9 +7,9 @@
<!-- <el-descriptions-item label="收款单类型">-->
<!-- <dict-tag :options="dict.type.receipt_bill_type" :value="data.receiptBillType"/>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
<el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>
<el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>
<el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }}</span></el-descriptions-item>
<el-descriptions-item label="未税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithoutTax) }}</span></el-descriptions-item>
<el-descriptions-item label="税额(元)"><span style="color: red">{{ formatCurrency(data.taxAmount) }}</span></el-descriptions-item>
<el-descriptions-item label="支付方式">
<dict-tag :options="dict.type.payment_method" :value="data.receiptMethod"/>
</el-descriptions-item>

2
oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue
View File

@ -46,7 +46,7 @@
<!-- <el-table-column label="项目名称" align="center" prop="projectName" />-->
<el-table-column label="金额" align="center" prop="totalPriceWithTax" >
<template slot-scope="scope">
<span style="color: red">{{ scope.row.totalPriceWithTax }}</span>
<span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->

2
oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue
View File

@ -31,7 +31,7 @@
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column label="开票编号" align="center" prop="invoiceBillCode" />
<el-table-column label="客户" align="center" prop="partnerName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime) }}</span>

10
oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
View File

@ -4,9 +4,9 @@
<el-descriptions title="开票单信息" :column="3" border>
<el-descriptions-item label="销售-开票单编号">{{ data.invoiceBillCode }}</el-descriptions-item>
<el-descriptions-item :span="2" label="进货商">{{ data.partnerName }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
<el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
<!-- <el-descriptions-item label="银行账号">{{ data.buyerBankAccount }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="账户名称">{{ data.buyerName }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="银行开户行">{{ data.buyerBank }}</el-descriptions-item>-->
@ -29,8 +29,8 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
<el-table-column prop="receiptAmount" label="本次开票金额" align="center"></el-table-column>
<el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="receiptAmount" label="本次开票金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
</el-table>
</div>

2
oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue
View File

@ -43,7 +43,7 @@
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column label="开票编号" align="center" prop="invoiceBillCode" />
<el-table-column label="进货商" align="center" prop="partnerName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>

2
oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
View File

@ -33,7 +33,7 @@
<el-table-column label="客户" align="center" prop="partnerName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax">
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ scope.row.totalPriceWithTax }}</span>
<span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">

6
oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
View File

@ -5,13 +5,13 @@
<el-descriptions-item label="销售-开票单编号">{{ data.invoiceBillCode }}</el-descriptions-item>
<el-descriptions-item :span="2" label="进货商">{{ data.partnerName }}</el-descriptions-item>
<el-descriptions-item label="含税总价(元)">
<span :style="data.totalPriceWithTax < 0 ? 'color: red' : ''">{{ data.totalPriceWithTax }}</span>
<span :style="data.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(data.totalPriceWithTax) }}</span>
</el-descriptions-item>
<el-descriptions-item label="未税总价(元)">
<span :style="data.totalPriceWithoutTax < 0 ? 'color: red' : ''">{{ data.totalPriceWithoutTax }}</span>
<span :style="data.totalPriceWithoutTax < 0 ? 'color: red' : ''">{{ formatCurrency(data.totalPriceWithoutTax) }}</span>
</el-descriptions-item>
<el-descriptions-item label="税额(元)">
<span :style="data.taxAmount < 0 ? 'color: red' : ''">{{ data.taxAmount }}</span>
<span :style="data.taxAmount < 0 ? 'color: red' : ''">{{ formatCurrency(data.taxAmount) }}</span>
</el-descriptions-item>
<!-- <el-descriptions-item label="银行账号">{{ data.buyerBankAccount }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="账户名称">{{ data.buyerName }}</el-descriptions-item>-->

2
oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
View File

@ -45,7 +45,7 @@
<el-table-column label="进货商" align="center" prop="partnerName" />
<el-table-column label="金额" align="center" prop="totalPriceWithTax">
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ scope.row.totalPriceWithTax }}</span>
<span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<el-table-column label="提交日期" align="center" prop="applyTime" width="180">

7
oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue
View File

@ -178,7 +178,7 @@
</el-col>
</el-row>
<el-row type="flex" justify="end" align="middle" class="summary-row">
<el-col :span="18" style="text-align: center;">
<el-col :span="orderData.orderStatus==='1'?18:24" style="text-align: center;">
<span style="margin-right: 5px;">商业折扣</span>
<el-select
v-model="selectedDiscount"
@ -278,7 +278,12 @@ export default {
return this.calculateTotal(this.order.maintenanceProjectProductInfoList, this.selectedDiscount);
},
grandTotal() {
if (this.orderData.orderStatus === '1'){
return this.softwareTotal + this.hardwareTotal + this.maintenanceTotal;
}else{
return this.finalTotal;
}
},
finalTotal() {
return this.softwareDiscountedTotal + this.hardwareDiscountedTotal + this.maintenanceDiscountedTotal;

27
oms_web/oms_vue/src/views/approve/order/index.vue
View File

@ -49,6 +49,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input
v-model="queryParams.productModel"
placeholder="请输入产品型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -72,7 +88,12 @@
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目编号" align="center" prop="projectCode" />
<el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column label="订单金额" align="center" prop="actualPurchaseAmount" />
<el-table-column label="订单金额" align="center" prop="actualPurchaseAmount" >
<template slot-scope="scope">
<span>{{ formatCurrency(scope.row.actualPurchaseAmount || scope.row.shipmentAmount) }}</span>
</template>
</el-table-column>
<el-table-column label="汇智负责人" align="center" prop="dutyName" />
<el-table-column label="审批节点" align="center" prop="approveNode">
<template slot-scope="scope">
@ -128,6 +149,7 @@
<script>
import { listOrder } from "@/api/approve/order";
import ApproveDialog from './Approve.vue';
import {formatCurrency} from "../../../utils";
export default {
name: "Order",
@ -154,6 +176,8 @@ export default {
orderCode: null,
projectName: null,
projectCode: null,
productCode: null,
productModel: null,
customerName: null,
dutyName: null,
approveNode: null,
@ -164,6 +188,7 @@ export default {
this.getList();
},
methods: {
formatCurrency,
toApproved(){
this.$router.push({
path: '/approve/orderLog',

19
oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue
View File

@ -23,7 +23,22 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input
v-model="queryParams.productModel"
placeholder="请输入产品型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -142,6 +157,8 @@ export default {
buyerName: null,
vendorName: null,
ownerName: null,
productCode: null,
productModel: null,
approveStatus: '1',
params:{
applyTimeStart: null,

19
oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue
View File

@ -23,7 +23,22 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input
v-model="queryParams.productModel"
placeholder="请输入产品型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -134,6 +149,8 @@ export default {
purchaseNo: null,
buyerName: null,
vendorName: null,
productCode: null,
productModel: null,
ownerName: null,
approveStatus: '3', // 已审批状态通常为3
params:{

22
oms_web/oms_vue/src/views/finance/charge/index.vue
View File

@ -79,26 +79,26 @@
</template>
</el-table-column>
<el-table-column label="收入" align="center" v-if="columns.incomeWithTaxTotal.visible || columns.incomeWithoutTaxTotal.visible || columns.incomeTax.visible">
<el-table-column label="含税总价(元)" align="center" prop="incomeWithTaxTotal" width="180" v-if="columns.incomeWithTaxTotal.visible" key="incomeWithTaxTotal"/>
<el-table-column label="未含税总价(元)" align="center" prop="incomeWithoutTaxTotal" width="180" v-if="columns.incomeWithoutTaxTotal.visible" key="incomeWithoutTaxTotal"/>
<el-table-column label="含税总价(元)" align="center" prop="incomeWithTaxTotal" width="180" v-if="columns.incomeWithTaxTotal.visible" key="incomeWithTaxTotal" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未含税总价(元)" align="center" prop="incomeWithoutTaxTotal" width="180" v-if="columns.incomeWithoutTaxTotal.visible" key="incomeWithoutTaxTotal" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="税额(元)" align="center" prop="incomeTax" width="180" v-if="columns.incomeTax.visible" key="incomeTax">
<template slot-scope="scope">
<span>{{ $calc.sub(scope.row.incomeWithTaxTotal, scope.row.incomeWithoutTaxTotal) }}</span>
<span>{{ formatCurrency($calc.sub(scope.row.incomeWithTaxTotal, scope.row.incomeWithoutTaxTotal)) }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="成本" align="center" v-if="columns.costSoftwareWithoutTax.visible || columns.costHardwareWithoutTax.visible || columns.costSoftwareMaintWithoutTax.visible || columns.costHardwareMaintWithoutTax.visible || columns.costProvinceServiceWithoutTax.visible || columns.costOtherWithoutTax.visible || columns.allCostWithoutTax.visible">
<el-table-column label="软件折后未税小计" align="center" prop="costSoftwareWithoutTax" width="180" v-if="columns.costSoftwareWithoutTax.visible" key="costSoftwareWithoutTax"/>
<el-table-column label="硬件折后未税小计" align="center" prop="costHardwareWithoutTax" width="180" v-if="columns.costHardwareWithoutTax.visible" key="costHardwareWithoutTax"/>
<el-table-column label="软件维保折后未税小计" align="center" prop="costSoftwareMaintWithoutTax" width="180" v-if="columns.costSoftwareMaintWithoutTax.visible" key="costSoftwareMaintWithoutTax"/>
<el-table-column label="硬件维保折后未税小计" align="center" prop="costHardwareMaintWithoutTax" width="180" v-if="columns.costHardwareMaintWithoutTax.visible" key="costHardwareMaintWithoutTax"/>
<el-table-column label="省代服务折后未税小计" align="center" prop="costProvinceServiceWithoutTax" width="180" v-if="columns.costProvinceServiceWithoutTax.visible" key="costProvinceServiceWithoutTax"/>
<el-table-column label="其它折后未税小计" align="center" prop="costOtherWithoutTax" width="180" v-if="columns.costOtherWithoutTax.visible" key="costOtherWithoutTax"/>
<el-table-column label="成本未税合计" align="center" prop="allCostWithoutTax" width="180" v-if="columns.allCostWithoutTax.visible" key="allCostWithoutTax">
<el-table-column label="软件折后未税小计" align="center" prop="costSoftwareWithoutTax" width="180" v-if="columns.costSoftwareWithoutTax.visible" key="costSoftwareWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="硬件折后未税小计" align="center" prop="costHardwareWithoutTax" width="180" v-if="columns.costHardwareWithoutTax.visible" key="costHardwareWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="软件维保折后未税小计" align="center" prop="costSoftwareMaintWithoutTax" width="180" v-if="columns.costSoftwareMaintWithoutTax.visible" key="costSoftwareMaintWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="硬件维保折后未税小计" align="center" prop="costHardwareMaintWithoutTax" width="180" v-if="columns.costHardwareMaintWithoutTax.visible" key="costHardwareMaintWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="省代服务折后未税小计" align="center" prop="costProvinceServiceWithoutTax" width="180" v-if="columns.costProvinceServiceWithoutTax.visible" key="costProvinceServiceWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="其它折后未税小计" align="center" prop="costOtherWithoutTax" width="180" v-if="columns.costOtherWithoutTax.visible" key="costOtherWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="成本未税合计" align="center" prop="allCostWithoutTax" width="180" v-if="columns.allCostWithoutTax.visible" key="allCostWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)">
</el-table-column>
</el-table-column>
<el-table-column label="毛利" align="center" prop="grossProfit" width="180" v-if="columns.grossProfit.visible" key="grossProfit"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="180" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利率" align="center" prop="grossProfitRate" width="180" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
<el-table-column label="备注" align="center" prop="remark" width="180" v-if="columns.remark.visible" key="remark"/>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">

10
oms_web/oms_vue/src/views/finance/invoice/components/AddForm.vue
View File

@ -54,11 +54,11 @@
<el-table-column label="项目名称" align="center" prop="projectName" 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="totalPriceWithTax" width="120"/>
<el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120"/>
<el-table-column label="含税总价" align="center" prop="totalPriceWithTax" 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" width="120">
<template slot-scope="scope">
{{ calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="本次开票比例" align="center" width="120">
@ -66,7 +66,7 @@
{{ calculateOrderCurrentInvoiceRate(scope.row.id) }}%
</template>
</el-table-column>
<el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120"/>
<el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
<template slot-scope="scope">
<el-button
@ -89,7 +89,7 @@
/>
<div class="total-info">
<span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ totalPlannedAmount.toFixed(2) }}</el-tag></span>
<span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ formatCurrency(totalPlannedAmount.toFixed(2)) }}</el-tag></span>
<span>计划收票比例: <el-tag type="info">{{ totalReceivableAmountWithTax ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) : 0 }}%</el-tag></span>
</div>
</div>

14
oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue
View File

@ -23,25 +23,25 @@
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">含税总价(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ detail.totalPriceWithTax }}</span></div>
<div class="detail-item">含税总价(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ detail.totalPriceWithoutTax }} </span></div>
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithoutTax) }} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">税额(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ $calc.sub(detail.totalPriceWithTax,detail.totalPriceWithoutTax) }} </span></div>
<div class="detail-item">税额(元): <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency($calc.sub(detail.totalPriceWithTax,detail.totalPriceWithoutTax)) }} </span></div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">发票含税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"> {{ detail.invoicePriceWithTax }}</span></div>
<div class="detail-item">发票含税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"> {{ formatCurrency(detail.invoicePriceWithTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">发票未税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ detail.invoicePriceWithoutTax }}</span></div>
<div class="detail-item">发票未税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ formatCurrency(detail.invoicePriceWithoutTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">发票税额（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ $calc.sub(detail.invoicePriceWithTax,detail.invoicePriceWithoutTax) }}</span></div>
<div class="detail-item">发票税额（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ formatCurrency($calc.sub(detail.invoicePriceWithTax,detail.invoicePriceWithoutTax)) }}</span></div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -120,7 +120,7 @@
<el-table-column property="totalPriceWithTax" label="含税总价（元）"></el-table-column>
<el-table-column property="receiptAmount" label="本次开票金额">
<template slot-scope="scope">
<span>{{ Math.abs(scope.row.receiptAmount) }}</span>
<span>{{ formatCurrency(Math.abs(scope.row.receiptAmount)) }}</span>
</template>
</el-table-column>
<el-table-column property="receiptRate" label="本次开票比例(%)">

6
oms_web/oms_vue/src/views/finance/invoice/components/InvoiceDialog.vue
View File

@ -58,7 +58,7 @@
<div class="detail-item">
<span class="item-label">含税金额</span>
<span class="item-value">{{ invoiceData.invoicePriceWithTax }}</span>
<span class="item-value">{{ formatCurrency(invoiceData.invoicePriceWithTax) }}</span>
</div>
<!-- <div class="detail-item">
<span class="item-label">发票含税金额</span>
@ -66,7 +66,7 @@
</div> -->
<div class="detail-item">
<span class="item-label">未税金额</span>
<span class="item-value">{{ invoiceData.invoicePriceWithoutTax }}</span>
<span class="item-value">{{ formatCurrency(invoiceData.invoicePriceWithoutTax) }}</span>
</div>
<!-- <div class="detail-item">
<span class="item-label">发票未税金额</span>
@ -74,7 +74,7 @@
</div> -->
<div class="detail-item">
<span class="item-label">税额</span>
<span class="item-value">{{ invoiceData.taxAmount }}</span>
<span class="item-value">{{ formatCurrency(invoiceData.taxAmount) }}</span>
</div>
<!-- <div class="detail-item">
<span class="item-label">发票税额</span>

6
oms_web/oms_vue/src/views/finance/invoice/components/InvoiceInfoView.vue
View File

@ -59,9 +59,9 @@
<el-table-column label="单位" prop="unit" align="center" width="60"></el-table-column>
<el-table-column label="数量" prop="quantity" align="center" width="80"></el-table-column>
<el-table-column label="单价" prop="price" align="center" width="100"></el-table-column>
<el-table-column label="金额" prop="allPrice" align="center" width="100"></el-table-column>
<el-table-column label="金额" prop="allPrice" align="center" width="100" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column label="税率%" prop="taxRate" align="center" width="80"></el-table-column>
<el-table-column label="税额" prop="taxAmount" align="center" width="100"></el-table-column>
<el-table-column label="税额" prop="taxAmount" align="center" width="100" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
</el-table>
</div>
@ -73,7 +73,7 @@
</div>
<div class="total-label-small">(小写)</div>
<div class="total-value-number">
¥{{ totalAmountNumber }}
¥{{ formatCurrency(totalAmountNumber) }}
</div>
</div>

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

@ -136,28 +136,28 @@
<el-table-column label="进货商名称" align="center" prop="partnerName" width="300" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" >
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }}</span>
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" width="180">
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithoutTax }}</span>
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span>
</template>
</el-table-column>
<el-table-column label="发票未税总价(元)" align="center" prop="invoicePriceWithoutTax" width="180">
<template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.invoicePriceWithoutTax }}</span>
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.invoicePriceWithoutTax) }}</span>
</template>
</el-table-column>
<el-table-column label="税额(元)" align="center" prop="taxAmount" width="180">
<template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ $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>
</el-table-column>
<el-table-column label="发票税额(元)" align="center" prop="invoicePriceTax" width="180">
<template slot-scope="scope">
<span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ $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>
</el-table-column>
<el-table-column label="开票状态" align="center" prop="invoiceStatus" width="150" >

24
oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
View File

@ -25,7 +25,7 @@
<div class="detail-item"><strong>该制造商是否有预付单:</strong> {{ formData.preResidueAmount == 0 ? '否' : '是' }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>预付金额(元):</strong> {{ formData.preResidueAmount }}</div>
<div class="detail-item"><strong>预付金额(元):</strong> {{ formatCurrency(formData.preResidueAmount) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -41,35 +41,35 @@
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>含税总价(元):</strong> {{ formData.totalPriceWithTax }}</div>
<div class="detail-item"><strong>含税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithTax) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>未税总价(元):</strong> {{ formData.totalPriceWithoutTax }}</div>
<div class="detail-item"><strong>未税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithoutTax) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>税额(元):</strong> {{ formData.taxAmount }}</div>
<div class="detail-item"><strong>税额(元):</strong> {{ formatCurrency(formData.taxAmount) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>未付款金额(元):</strong> {{ formData.unpaidPaymentAmount }}</div>
<div class="detail-item"><strong>未付款金额(元):</strong> {{ formatCurrency(formData.unpaidPaymentAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>已付款金额(元):</strong> {{ formData.paidPaymentAmount }}</div>
<div class="detail-item"><strong>已付款金额(元):</strong> {{ formatCurrency(formData.paidPaymentAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>付款中金额(元):</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.paidPaymentAmount),formData.unpaidPaymentAmount) }}</div>
<div class="detail-item"><strong>付款中金额(元):</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.paidPaymentAmount),formData.unpaidPaymentAmount)) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>未收票金额(元):</strong> {{ formData.unreceivedTicketAmount }}</div>
<div class="detail-item"><strong>未收票金额(元):</strong> {{ formatCurrency(formData.unreceivedTicketAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>已收票金额(元):</strong> {{ formData.receivedTicketAmount }}</div>
<div class="detail-item"><strong>已收票金额(元):</strong> {{ formatCurrency(formData.receivedTicketAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>收票中金额(元):</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedTicketAmount),formData.unreceivedTicketAmount)}}</div>
<div class="detail-item"><strong>收票中金额(元):</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedTicketAmount),formData.unreceivedTicketAmount))}}</div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -107,7 +107,7 @@
</el-table-column>
<el-table-column prop="paymentAmount" label="本次付款金额">
<template slot-scope="scope">
<span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ scope.row.paymentAmount }}</span>
<span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ formatCurrency(scope.row.paymentAmount) }}</span>
</template>
</el-table-column>
<el-table-column prop="paymentRate" label="本次付款比例"></el-table-column>
@ -142,7 +142,7 @@
</el-table-column>
<el-table-column prop="paymentAmount" label="本次收票金额">
<template slot-scope="scope">
<span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ scope.row.paymentAmount }}</span>
<span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ formatCurrency(scope.row.paymentAmount) }}</span>
</template>
</el-table-column>

12
oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
View File

@ -39,7 +39,7 @@
<el-table-column label="预计付款时间" align="center" prop="planPaymentDate" width="180"/>
<el-table-column label="预期付款计划" align="center" width="100" prop="planAmount">
<template slot-scope="scope">
{{ calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期付款比例" align="center" width="120">
@ -56,8 +56,8 @@
<!-- <dict-tag :options="dict.type.payment_status" :value="scope.row.paymentStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120"/>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="本次付款金额" align="center" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2) }}-->
@ -68,10 +68,10 @@
<!-- {{ calculateOrderCurrentPaymentRate(scope.row.id) }}%-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="已付款金额(元)" align="center" prop="paidPaymentAmount" width="120"/>
<el-table-column label="已付款金额(元)" align="center" prop="paidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中金额(元)" align="center" prop="paidAmount" width="120">
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount) }}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount)) }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@ -90,7 +90,7 @@
<div class="total-info">
<span style="margin-left: 20px;">计划付款总金额: <el-tag type="success">{{
totalPlannedAmount.toFixed(2)
formatCurrency(totalPlannedAmount.toFixed(2))
}}</el-tag></span>
<span>计划付款比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) }}%</el-tag></span>
</div>

14
oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
View File

@ -51,7 +51,7 @@
<!-- </el-table-column>-->
<el-table-column label="预期收票计划" align="center" width="120">
<template slot-scope="scope">
{{ calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期收票比例" align="center" width="120">
@ -68,13 +68,13 @@
<!-- <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120"/>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收票金额(元)" align="center" prop="receivedTicketAmount" width="120"/>
<el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120">
<el-table-column label="已收票金额(元)" align="center" prop="receivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120" >
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount)}}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount))}}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@ -93,7 +93,7 @@
<div class="total-info">
<span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{
totalPlannedAmount.toFixed(2)
formatCurrency( totalPlannedAmount.toFixed(2))
}}</el-tag></span>
<span>计划收票比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) }}%</el-tag></span>
</div>

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

@ -133,7 +133,7 @@
<span :style="getPaymentDateStyle(scope.row.planPaymentDate)">{{ scope.row.planPaymentDate }}</span>
</template>
</el-table-column>
<el-table-column label="预计付款金额" align="center" prop="planAmount" width="120" />
<el-table-column label="预计付款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="该制造商是否有预付单" align="center" prop="hasAdvancePayment" width="150">
<template slot-scope="scope">
{{ scope.row.preResidueAmount == 0 ? '否' : '是' }}
@ -148,7 +148,7 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<!-- <el-table-column label="未税总价" align="center" prop="totalPriceWithoutTax" width="120" />-->
<!-- <el-table-column label="税额" align="center" prop="taxAmount" width="120" />-->
<!-- <el-table-column label="付款状态" align="center" prop="paymentStatus" width="120">-->
@ -175,8 +175,8 @@
<!-- >生成收票单</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" />
<el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" />
<el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
<!-- <el-table-column label="付款中金额" align="center" prop="payingAmount" width="120" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
<template slot-scope="scope">
@ -417,7 +417,7 @@ export default {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2);
sums[index] = this.formatCurrency(sums[index]);
} else {
sums[index] = 'N/A';
}

46
oms_web/oms_vue/src/views/finance/payable/report.vue
View File

@ -96,8 +96,8 @@
<dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
</template>
</el-table-column>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
</el-table-column>
@ -114,9 +114,9 @@
<!-- 应付 -->
<el-table-column label="应付单" align="center">
<el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax"/>
<el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax"/>
<el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax"/>
<el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 付款 -->
@ -126,15 +126,15 @@
<dict-tag :options="dict.type.report_payment_status" :value="scope.row.paymentStatus"/>
</template>
</el-table-column>
<el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax"/>
<el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax"/>
<el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax"/>
<el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax"/>
<el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax"/>
<el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax"/>
<el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax"/>
<el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax"/>
<el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax"/>
<el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 收票 -->
@ -144,15 +144,15 @@
<dict-tag :options="dict.type.report_ticket_status" :value="scope.row.ticketStatus"/>
</template>
</el-table-column>
<el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax"/>
<el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax"/>
<el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax"/>
<el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax"/>
<el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax"/>
<el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax"/>
<el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax"/>
<el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax"/>
<el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax"/>
<el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"1/>
</el-table-column>
</el-table>

42
oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
View File

@ -1,7 +1,8 @@
<template>
<el-dialog title="新增付款单" :visible.sync="internalVisible" width="1200px" @close="handleClose"
:close-on-click-modal="false" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div style="max-height: 70vh;overflow: auto">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item label="制造商名称" prop="vendorCode">
@ -45,7 +46,21 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="其它特别说明" prop="remark">
<el-input v-model="form.remark" type="textarea"
:rows="2"
style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附件" prop="fileId">
<file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="1"
:file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']"/>
</el-form-item>
</el-col>
</el-row>
<!-- Tables -->
<div v-if="form.vendorCode">
<div v-if="form.paymentBillType === 'FROM_PAYABLE'" class="table-container">
@ -56,7 +71,6 @@
border
style="width: 100%"
@selection-change="handleSelectionChange"
max-height="400"
row-key="id"
show-summary
:summary-method="getPayableSummary"
@ -125,7 +139,7 @@
@selection-change="handleSelectionChange"
@select="handleSelect"
@select-all="handleSelectAll"
max-height="400"
row-key="id"
>
<el-table-column type="selection" width="55" reserve-selection></el-table-column>
@ -151,8 +165,8 @@
<div v-else style="text-align: center; color: #909399; padding: 20px;">
请先选择制造商
</div>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<!-- <div v-if="form.paymentBillType === 'FROM_PAYABLE'" style="float: left; line-height: 36px;">-->
<!-- <span style="margin-right: 20px;">计划付款总金额: <el-tag type="success">{{-->
@ -185,10 +199,11 @@
import {listAllVendor} from "@/api/base/vendor";
import {listPayableBills, listOrders} from "@/api/finance/payment";
import PaymentPlanSelector from "../../payable/components/PaymentPlan";
import FileUpload from "@/components/FileUpload";
export default {
name: "AddForm",
components: {PaymentPlanSelector},
components: {PaymentPlanSelector, FileUpload},
props: {
visible: {
type: Boolean,
@ -214,7 +229,8 @@ export default {
vendorName: null,
remark: null,
totalPriceWithTax: 0,
estimatedPaymentTime: null
estimatedPaymentTime: null,
fileId: null
},
rules: {
vendorCode: [{required: true, message: "制造商名称不能为空", trigger: "change"}],
@ -227,6 +243,7 @@ export default {
isPaymentPlanSelectorOpen: false,
choosePayable: {},
currentPayableOrderIndexForPlan: -1,
fileList: [],
};
},
computed: {
@ -280,6 +297,10 @@ export default {
this.selectedRows = [];
this.loadTableData();
},
handleFileListChanged(fileList) {
this.fileList = fileList;
this.form.fileId = this.fileList.map(f => f.id).filter(id => !!id).join(',')
},
loadTableData() {
if (!this.form.vendorCode) return;
@ -453,7 +474,8 @@ export default {
vendorName: this.form.vendorName,
remark: this.form.remark,
payableOrders: processedPayableOrders,
totalMergePaymentAmount: this.totalPlannedAmount
totalMergePaymentAmount: this.totalPlannedAmount,
fileId: this.form.fileId
};
this.$emit("submit", submitData);
@ -475,8 +497,10 @@ export default {
vendorCode: this.form.vendorCode,
projectCode:order.projectCode,
projectName:order.projectName,
remark: this.form.remark,
paymentTime: this.form.estimatedPaymentTime,
totalPriceWithTax:this.form.totalPriceWithTax
totalPriceWithTax:this.form.totalPriceWithTax,
fileId: this.form.fileId
};
this.$emit("submit", submitData);

47
oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
View File

@ -24,13 +24,13 @@
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">含税总价(元):<span :class="{'red-text':detail.paymentBillType==='REFUND'}"> {{ detail.totalPriceWithTax }}</span></div>
<div class="detail-item">含税总价(元):<span :class="{'red-text':detail.paymentBillType==='REFUND'}"> {{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ detail.totalPriceWithoutTax }}</span></div>
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ formatCurrency(detail.totalPriceWithoutTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">税额(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ detail.taxAmount }} </span></div>
<div class="detail-item">税额(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -39,19 +39,20 @@
<dict-tag :options="dict.type.payment_bill_type" :value="detail.paymentBillType"/>
</div>
</el-col>
<el-col :span="8">
<div class="detail-item">预付单剩余额度: {{ detail.preResidueAmount || '-' }}</div>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="detail-item">预付单剩余额度: {{ detail.preResidueAmount || '-' }}</div>-->
<!-- </el-col>-->
<el-col :span="8">
<div class="detail-item">实际付款时间: {{ detail.actualPaymentTime || '-'}}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">支付方式:
<dict-tag :options="dict.type.payment_method" :value="detail.paymentMethod"/>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">付款状态:
<dict-tag :options="dict.type.payment_status" :value="detail.paymentStatus"/>
@ -60,24 +61,26 @@
<el-col :span="8">
<div class="detail-item">审批节点: {{ detail.approveNode|| '-' }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">审批状态:
<dict-tag :options="dict.type.approve_status" :value="detail.approveStatus"/>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">审批通过时间: {{ detail.approveTime || '-'}}</div>
</el-col>
<el-col :span="8">
<div class="detail-item">账户名称: {{ detail.payName }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">银行账号: {{ detail.payBankNumber }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">银行开户行: {{ detail.payBankOpenAddress }}</div>
</el-col>
@ -85,6 +88,17 @@
<div class="detail-item">银行行号: {{ detail.bankNumber }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<div class="detail-item">其它特别说明: {{ detail.remark }}</div>
</el-col>
<el-col :span="24">
<div class="detail-item">
<span style="margin-right: 10px">附件:</span>
<file-upload :value="detail.fileList" :disabled="true" :show-remove="false" :show-upload-btn="false"/>
</div>
</el-col>
</el-row>
</div>
</div>
@ -95,10 +109,10 @@
<el-table-column property="projectCode" label="项目编号"></el-table-column>
<el-table-column property="projectName" label="项目名称"></el-table-column>
<el-table-column property="payableBillCode" label="采购-应付单编号"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column property="paymentAmount" label="本次付款金额">
<template slot-scope="scope">
<span>{{ Math.abs(scope.row.paymentAmount) }}</span>
<span>{{ formatCurrency(Math.abs(scope.row.paymentAmount)) }}</span>
</template>
</el-table-column>
<el-table-column property="paymentRate" label="本次付款比例">
@ -113,8 +127,11 @@
</template>
<script>
import FileUpload from "@/components/FileUpload";
export default {
name: "DetailDrawer",
components: {FileUpload},
props: {
visible: {
type: Boolean,
@ -122,7 +139,7 @@ export default {
},
detail: {
type: Object,
default: () => null,
default: () => {},
},
},
dicts:['payment_bill_type','approve_status','payment_status','payment_method'],

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

@ -135,11 +135,25 @@
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-download"
v-hasPermi="['finance:payment:export']"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="paymentList" show-summary :summary-method="getSummaries">
<el-table-column label="采购-付款单编号" width="200" align="center" prop="paymentBillCode"/>
<el-table-column label="采购-付款单编号" width="200" align="center" prop="paymentBillCode">
<template slot-scope="scope">
<a @click="handleDetail(scope.row)" class="link-type">{{ scope.row.paymentBillCode }}</a>
</template>
</el-table-column>
<el-table-column label="预计付款时间" align="center" prop="paymentTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.paymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -148,7 +162,7 @@
<el-table-column label="制造商名称" width="200" align="center" prop="vendorName"/>
<el-table-column label="含税总价(元)" align="center" width="200" prop="totalPriceWithTax">
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }}</span>
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="100" prop="paymentBillType">
@ -156,7 +170,7 @@
<dict-tag :options="dict.type.payment_bill_type" :value="scope.row.paymentBillType"/>
</template>
</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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.actualPaymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -205,13 +219,7 @@
v-show="(scope.row.approveStatus==='0' || scope.row.approveStatus==='3') && (scope.row.paymentBillType==='FROM_PAYABLE'||scope.row.paymentBillType==='PRE_PAYMENT')"
@click="applyPayment(scope.row)"
>申请付款</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-position"-->
<!-- v-show="(scope.row.approveStatus==='0' || scope.row.approveStatus==='3') && scope.row.paymentBillType==='REFUND' "-->
<!-- @click="applyRefundApprove(scope.row)"-->
<!-- >发起退款</el-button>-->
<el-button
size="mini"
type="text"
@ -233,6 +241,15 @@
v-if="(scope.row.approveStatus === '2' || scope.row.approveStatus==='3') && (scope.row.paymentStatus==='1'||scope.row.paymentStatus==='3')"
@click="handleRevoke(scope.row)"
>撤销</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-hasPermi="['finance:payment:remove']"
v-show="(scope.row.approveStatus==='0' || scope.row.approveStatus==='3') && scope.row.paymentBillType==='PRE_PAYMENT' && scope.row.paymentStatus === '1' "
@click="handleDelete(scope.row.id)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -289,7 +306,18 @@
</template>
<script>
import { listPayment, getPayment, returnPayment, addPaymentFromPayable, applyPaymentApi,applyRefundApprove, applyRefund,addPayment,handleRevoke } from "@/api/finance/payment";
import {
listPayment,
getPayment,
returnPayment,
addPaymentFromPayable,
applyPaymentApi,
applyRefundApprove,
applyRefund,
addPayment,
handleRevoke,
exportPayment, deletePayment
} from "@/api/finance/payment";
import { addDateRange } from "@/utils/ruoyi";
import DetailDrawer from "./components/DetailDrawer.vue";
import AddForm from "./components/AddForm.vue";
@ -336,7 +364,7 @@ export default {
dateRangeActual: [],
// 详情抽屉
detailOpen: false,
detailData: null,
detailData: {},
// 新增弹窗
addOpen: false,
// 回执单弹窗
@ -394,6 +422,13 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
handleExport() {
this.$modal.confirm('是否确认导出付款单数据？').then(() => {
return exportPayment(this.queryParams);
}).then(response => {
this.$download.download( response.msg)
})
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeApproval = [];
@ -408,6 +443,7 @@ export default {
},
/** 新增提交 */
handleAddSubmit(form) {
console.log('1111')
if (form.paymentBillType==='FROM_PAYABLE'){
addPaymentFromPayable(form).then(response => {
this.$modal.msgSuccess("新增成功");
@ -468,6 +504,14 @@ export default {
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(() => {
@ -496,7 +540,7 @@ export default {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2);
sums[index] = this.formatCurrency(sums[index]);
} else {
sums[index] = 'N/A';
}

12
oms_web/oms_vue/src/views/finance/receipt/components/AddForm.vue
View File

@ -68,7 +68,7 @@
<!-- </el-table-column>-->
<el-table-column label="预期收票计划" align="center" width="120">
<template slot-scope="scope">
{{ calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期收票比例" align="center" width="120">
@ -85,13 +85,13 @@
<!-- <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未收票金额(元)" align="center" prop="unInvoicedAmount" width="120"/>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" 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="invoicedAmount" width="120"/>
<el-table-column label="已收票金额(元)" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120">
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount)}}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount))}}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@ -116,7 +116,7 @@
/>
<div class="total-info">
<span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ totalPlannedAmount.toFixed(2) }}</el-tag></span>
<span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ formatCurrency(totalPlannedAmount.toFixed(2)) }}</el-tag></span>
<span>计划收票比例: <el-tag type="info">{{ totalPayableAmountWithTax ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) : 0 }}%</el-tag></span>
</div>
</div>

16
oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
View File

@ -26,28 +26,28 @@
<div class="detail-item">制造商名称: {{ detail.vendorName }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item">含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.totalPriceWithTax }}</span></div>
<div class="detail-item">含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.totalPriceWithoutTax }}</span></div>
<div class="detail-item">未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{formatCurrency(detail.totalPriceWithoutTax) }}</span></div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.taxAmount }} </span></div>
<div class="detail-item">税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">发票含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketPriceWithTax || '-'}} </span></div>
<div class="detail-item">发票含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.ticketPriceWithTax) || '-'}} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">发票未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketPriceWithoutTax || '-'}} </span></div>
<div class="detail-item">发票未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ (detail.ticketPriceWithoutTax) || '-'}} </span></div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">发票税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketAmount }} </span></div>
<div class="detail-item">发票税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.ticketAmount) }} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">收票状态:
@ -81,8 +81,8 @@
<el-table-column property="projectCode" label="项目编号"></el-table-column>
<el-table-column property="projectName" label="项目名称"></el-table-column>
<el-table-column property="payableBillCode" label="采购应付单编号"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价"></el-table-column>
<el-table-column property="paymentAmount" label="本次收票金额"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column property="paymentAmount" label="本次收票金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column property="paymentRate" label="本次收票比例(%)"></el-table-column>
</el-table>
</div>

12
oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
View File

@ -53,27 +53,27 @@
<div class="detail-item">
<span class="item-label">含税金额</span>
<span class="item-value">{{ receiptData.totalPriceWithTax }}</span>
<span class="item-value">{{ formatCurrency(receiptData.totalPriceWithTax) }}</span>
</div>
<div class="detail-item">
<span class="item-label">发票含税金额</span>
<span class="item-value">{{ attachment.priceWithTax||receiptData.ticketPriceWithTax }}</span>
<span class="item-value">{{ formatCurrency(attachment.priceWithTax||receiptData.ticketPriceWithTax) }}</span>
</div>
<div class="detail-item">
<span class="item-label">未税金额</span>
<span class="item-value">{{ receiptData.totalPriceWithoutTax }}</span>
<span class="item-value">{{ formatCurrency(receiptData.totalPriceWithoutTax) }}</span>
</div>
<div class="detail-item">
<span class="item-label">发票未税金额</span>
<span class="item-value">{{ attachment.priceWithoutTax||receiptData.ticketPriceWithoutTax }}</span>
<span class="item-value">{{ formatCurrency(attachment.priceWithoutTax||receiptData.ticketPriceWithoutTax) }}</span>
</div>
<div class="detail-item">
<span class="item-label">税额</span>
<span class="item-value">{{ receiptData.taxAmount }}</span>
<span class="item-value">{{ formatCurrency(receiptData.taxAmount) }}</span>
</div>
<div class="detail-item">
<span class="item-label">发票税额</span>
<span class="item-value">{{ attachment.taxAmount || receiptData.ticketAmount }}</span>
<span class="item-value">{{formatCurrency( attachment.taxAmount || receiptData.ticketAmount) }}</span>
</div>
<div class="detail-item">
<span class="item-label">备注</span>

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

@ -142,17 +142,17 @@
<el-table-column label="制造商名称" align="center" prop="vendorName" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" >
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }}</span>
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
</template>
</el-table-column>
<el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" >
<template slot-scope="scope">
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithoutTax }}</span>
<span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span>
</template>
</el-table-column>
<el-table-column label="税额(元)" align="center" prop="taxAmount" >
<template slot-scope="scope">
<span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ scope.row.taxAmount }}</span>
<span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ formatCurrency(scope.row.taxAmount) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="收票单类型" align="center" prop="ticketBillType" >-->

24
oms_web/oms_vue/src/views/finance/receivable/components/EditForm.vue
View File

@ -25,7 +25,7 @@
<div class="detail-item"><strong>该进货商是否有预收单:</strong> {{ formData.remainingAmount == 0 ? '否' : '是' }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>预收金额:</strong> {{ formData.remainingAmount }}</div>
<div class="detail-item"><strong>预收金额:</strong> {{ formatCurrency(formData.remainingAmount) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -41,35 +41,35 @@
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>含税总价(元):</strong> {{ formData.totalPriceWithTax }}</div>
<div class="detail-item"><strong>含税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithTax) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>未税总价(元):</strong> {{ formData.totalPriceWithoutTax }}</div>
<div class="detail-item"><strong>未税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithoutTax) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>税额(元):</strong> {{ formData.taxAmount }}</div>
<div class="detail-item"><strong>税额(元):</strong> {{ formatCurrency(formData.taxAmount) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>未收款金额:</strong> {{ formData.unreceivedAmount }}</div>
<div class="detail-item"><strong>未收款金额:</strong> {{ formatCurrency(formData.unreceivedAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>已收款金额:</strong> {{ formData.receivedAmount }}</div>
<div class="detail-item"><strong>已收款金额:</strong> {{ formatCurrency(formData.receivedAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>收款中金额:</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedAmount),formData.unreceivedAmount) }}</div>
<div class="detail-item"><strong>收款中金额:</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedAmount),formData.unreceivedAmount)) }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item"><strong>未开票金额:</strong> {{ formData.uninvoicedAmount }}</div>
<div class="detail-item"><strong>未开票金额:</strong> {{ formatCurrency(formData.uninvoicedAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>已开票金额:</strong> {{ formData.invoicedAmount }}</div>
<div class="detail-item"><strong>已开票金额:</strong> {{ formatCurrency(formData.invoicedAmount) }}</div>
</el-col>
<el-col :span="8">
<div class="detail-item"><strong>开票中金额:</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.invoicedAmount),formData.uninvoicedAmount)}}</div>
<div class="detail-item"><strong>开票中金额:</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.invoicedAmount),formData.uninvoicedAmount))}}</div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -105,7 +105,7 @@
{{ scope.row.actualReceiptTime || '-' }}
</template>
</el-table-column>
<el-table-column prop="receiptAmount" label="本次收款金额"></el-table-column>
<el-table-column prop="receiptAmount" label="本次收款金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="receiptRate" label="本次收款比例"></el-table-column>
<el-table-column prop="receiptStatus" label="收款状态">
<template slot-scope="scope">
@ -137,7 +137,7 @@
{{ scope.row.actualInvoiceTime || '-' }}
</template>
</el-table-column>
<el-table-column prop="invoiceAmount" label="本次开票金额"></el-table-column>
<el-table-column prop="invoiceAmount" label="本次开票金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="invoiceRate" label="本次开票比例"></el-table-column>
<el-table-column prop="invoiceStatus" label="开票状态">
<template slot-scope="scope">

12
oms_web/oms_vue/src/views/finance/receivable/components/MergeInvoiceDialog.vue
View File

@ -41,7 +41,7 @@
<!-- </el-table-column>-->
<el-table-column label="预期开票金额" align="center" width="120">
<template slot-scope="scope">
{{ calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期开票比例" align="center" width="120">
@ -57,13 +57,13 @@
<dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>
</template>
</el-table-column> -->
<el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120"/>
<el-table-column label="含税总价" align="center" prop="totalPriceWithTax" 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="invoicedAmount" width="120"/>
<el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中金额" align="center" prop="invoicedAmount" width="120">
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicedAmount), scope.row.uninvoicedAmount) }}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicedAmount), scope.row.uninvoicedAmount)) }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@ -82,7 +82,7 @@
<div class="total-info">
<span style="margin-left: 20px;">计划开票总金额: <el-tag type="success">{{
totalPlannedAmount.toFixed(2)
formatCurrency(totalPlannedAmount.toFixed(2))
}}</el-tag></span>
<span>计划开票比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) }}%</el-tag></span>
</div>

12
oms_web/oms_vue/src/views/finance/receivable/components/MergeReceiptDialog.vue
View File

@ -41,7 +41,7 @@
<!-- </el-table-column>-->
<el-table-column label="预期收款金额" align="center" width="120">
<template slot-scope="scope">
{{ calculateOrderCurrentReceiptAmount(scope.row.id).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentReceiptAmount(scope.row.id).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期收款比例" align="center" width="120">
@ -57,12 +57,12 @@
<dict-tag :options="dict.type.collection_status" :value="scope.row.collectionStatus"/>
</template>
</el-table-column> -->
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120"/>
<el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120"/>
<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="receivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中金额(元)" align="center" prop="receivedAmount" width="120">
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount) }}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount)) }}
</template>
</el-table-column>
@ -82,7 +82,7 @@
<div class="total-info">
<span style="margin-left: 20px;">计划收款总金额: <el-tag type="success">{{
totalPlannedAmount.toFixed(2)
formatCurrency(totalPlannedAmount.toFixed(2))
}}</el-tag></span>
<span>计划收款比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) }}%</el-tag></span>
</div>

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

@ -101,7 +101,7 @@
<el-table-column label="项目名称" align="center" prop="projectName" width="240" />
<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="planAmount" width="120" />
<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" >
<template slot-scope="scope">
{{ scope.row.remainingAmount == 0 ? '否' : '是' }}
@ -113,9 +113,9 @@
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" />
<el-table-column label="未收款金额" align="center" prop="unreceivedAmount" width="120" />
<el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" />
<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="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">
<template slot-scope="scope">
<el-button

12
oms_web/oms_vue/src/views/finance/receive/components/AddForm.vue
View File

@ -64,7 +64,7 @@
<!-- </el-table-column>-->
<el-table-column label="预期收款金额">
<template slot-scope="scope">
{{ calculateOrderCurrentReceiptAmount(scope.row).toFixed(2) }}
{{ formatCurrency(calculateOrderCurrentReceiptAmount(scope.row).toFixed(2)) }}
</template>
</el-table-column>
<el-table-column label="预期收款比例" align="center" width="120">
@ -80,12 +80,12 @@
<dict-tag :options="dict.type.collection_status" :value="scope.row.collectionStatus"/>
</template>
</el-table-column> -->
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120"/>
<el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120"/>
<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="receivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中金额(元)" align="center" prop="receivedAmount" width="120">
<template slot-scope="scope">
{{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount) }}
{{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount)) }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"
@ -104,7 +104,7 @@
<div class="total-info">
<span style="margin-left: 20px;">计划收款总金额: <el-tag type="success">{{
totalPlannedAmount.toFixed(2)
formatCurrency(totalPlannedAmount.toFixed(2))
}}</el-tag></span>
<span>计划收款比例: <el-tag type="info">{{ totalSelectedReceivableAmount ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalSelectedReceivableAmount,4),100) : 0 }}%</el-tag></span>
</div>

12
oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
View File

@ -24,13 +24,13 @@
<el-row :gutter="20">
<el-col :span="8">
<div class="detail-item">含税总价(元):<span :class="{'red-text':detail.receiptBillType==='REFUND'}"> {{ detail.totalPriceWithTax }} </span></div>
<div class="detail-item">含税总价(元):<span :class="{'red-text':detail.receiptBillType==='REFUND'}"> {{ formatCurrency(detail.totalPriceWithTax) }} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ detail.totalPriceWithoutTax }} </span></div>
<div class="detail-item">未税总价(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ formatCurrency(detail.totalPriceWithoutTax) }} </span></div>
</el-col>
<el-col :span="8">
<div class="detail-item">税额(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ detail.taxAmount }} </span></div>
<div class="detail-item">税额(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
</el-col>
</el-row>
<el-row :gutter="20">
@ -39,7 +39,7 @@
<dict-tag :options="dict.type.receipt_bill_type" :value="detail.receiptBillType"/></div>
</el-col>
<el-col :span="8">
<div class="detail-item">预收单剩余额度:{{detail.remainAmount}}
<div class="detail-item">预收单剩余额度:{{formatCurrency(detail.remainAmount)}}
</div>
</el-col>
<el-col :span="8">
@ -106,11 +106,11 @@
<el-table-column property="projectCode" label="项目编号"></el-table-column>
<el-table-column property="projectName" label="项目名称"></el-table-column>
<el-table-column property="receivableBillCode" label="应收单编号"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价(元)"></el-table-column>
<el-table-column property="totalPriceWithTax" label="含税总价(元)" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column property="receiptAmount" label="本次收款金额">
<template slot-scope="scope">
<span >
{{ Math.abs(scope.row.receiptAmount) }}
{{ formatCurrency(Math.abs(scope.row.receiptAmount)) }}
</span>
</template>
</el-table-column>

2
oms_web/oms_vue/src/views/finance/receive/components/ReceiveDialog.vue
View File

@ -53,7 +53,7 @@
<div class="detail-item">
<span class="item-label">收款总额</span>
<span class="item-value">{{ receiptData.totalPriceWithTax }}</span>
<span class="item-value">{{ formatCurrency(receiptData.totalPriceWithTax) }}</span>
</div>
<div class="detail-item">
<span class="item-label">备注</span>

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

@ -132,7 +132,7 @@
<el-table-column label="进货商名称" align="center" prop="partnerName" width="230" />
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" >
<template slot-scope="scope">
<span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }} </span></span>
<span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }} </span></span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="receiptBillType" width="180">
@ -140,7 +140,7 @@
<dict-tag :options="dict.type.receipt_bill_type" :value="scope.row.receiptBillType"/>
</template>
</el-table-column>
<el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="180"/>
<el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="180" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款状态" align="center" prop="receiveStatus" width="180">
<template slot-scope="scope">
<dict-tag :options="dict.type.receipt_bill_status" :value="scope.row.receiptStatus"/>

46
oms_web/oms_vue/src/views/finance/receive/report.vue
View File

@ -91,9 +91,9 @@
<!-- 应收 -->
<el-table-column label="应收单" align="center" v-if="columns.receivableWithTax.visible || columns.receivableWithoutTax.visible||columns.receivableTax.visible">
<el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax"/>
<el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax"/>
<el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax"/>
<el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
@ -105,8 +105,8 @@
<dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
</template>
</el-table-column>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
</el-table-column>
@ -128,15 +128,15 @@
<dict-tag :options="dict.type.report_receipt_status" :value="scope.row.receiptStatus"/>
</template>
</el-table-column>
<el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax"/>
<el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax"/>
<el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax"/>
<el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax"/>
<el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax"/>
<el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax"/>
<el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax"/>
<el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax"/>
<el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax"/>
<el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 开票 -->
@ -146,15 +146,15 @@
<dict-tag :options="dict.type.report_invoice_status" :value="scope.row.invoiceStatus"/>
</template>
</el-table-column>
<el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax"/>
<el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax"/>
<el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax"/>
<el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax"/>
<el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax"/>
<el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax"/>
<el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax"/>
<el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax"/>
<el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax"/>
<el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
</el-table>

88
oms_web/oms_vue/src/views/finance/report/index.vue
View File

@ -121,9 +121,9 @@
<!-- 应收 -->
<el-table-column label="应收单" align="center" v-if="columns.receivableWithTax.visible || columns.receivableWithoutTax.visible||columns.receivableTax.visible">
<el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax"/>
<el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax"/>
<el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax"/>
<el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
@ -135,8 +135,8 @@
<dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
</template>
</el-table-column>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
<el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
</el-table-column>
@ -158,15 +158,15 @@
<dict-tag :options="dict.type.report_receipt_status" :value="scope.row.receiptStatus"/>
</template>
</el-table-column>
<el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax"/>
<el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax"/>
<el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax"/>
<el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax"/>
<el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax"/>
<el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax"/>
<el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax"/>
<el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax"/>
<el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax"/>
<el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 开票 -->
@ -176,22 +176,22 @@
<dict-tag :options="dict.type.report_invoice_status" :value="scope.row.invoiceStatus"/>
</template>
</el-table-column>
<el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax"/>
<el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax"/>
<el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax"/>
<el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax"/>
<el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax"/>
<el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax"/>
<el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax"/>
<el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax"/>
<el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax"/>
<el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 应付 -->
<el-table-column label="应付单" align="center">
<el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax"/>
<el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax"/>
<el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax"/>
<el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 付款 -->
@ -201,15 +201,15 @@
<dict-tag :options="dict.type.report_payment_status" :value="scope.row.paymentStatus"/>
</template>
</el-table-column>
<el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax"/>
<el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax"/>
<el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax"/>
<el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax"/>
<el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax"/>
<el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax"/>
<el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax"/>
<el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax"/>
<el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax"/>
<el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
<!-- 收票 -->
@ -219,15 +219,15 @@
<dict-tag :options="dict.type.report_ticket_status" :value="scope.row.ticketStatus"/>
</template>
</el-table-column>
<el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax"/>
<el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax"/>
<el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax"/>
<el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax"/>
<el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax"/>
<el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax"/>
<el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax"/>
<el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax"/>
<el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax"/>
<el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
</el-table-column>
</el-table>

4
oms_web/oms_vue/src/views/finance/writeoff/invoice/WriteOffDetailDrawer.vue
View File

@ -11,7 +11,7 @@
<el-divider content-position="left">开票单信息</el-divider>
<el-table :data="[detail]" border stripe>
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
<el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="partnerName" label="进货商名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="invoiceBillCode" label="销售-开票单编号" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="开票单生成时间" align="center" width="160">
@ -31,7 +31,7 @@
<el-divider content-position="left">应收单明细</el-divider>
<el-table :data="detail.detailList" border stripe>
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column prop="receiptAmount" label="本次核销金额(元)" align="center"></el-table-column>
<el-table-column prop="receiptAmount" label="本次核销金额(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="partnerName" label="进货商名称" align="center"></el-table-column>
<el-table-column prop="receivableBillCode" label="销售-应收单编号" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="应收单生成时间" align="center"></el-table-column>

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

@ -94,9 +94,9 @@
<dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
</template>
</el-table-column>
<el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" />
<el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" />
<el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" />
<el-table-column label="核销含税总价(元)" align="center" 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" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button

4
oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
View File

@ -11,7 +11,7 @@
<el-divider content-position="left">付款单信息</el-divider>
<el-table :data="[detail]" border stripe>
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
<el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="paymentBillCode" label="采购付款单编号" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="paymentCreateTime" label="付款单生成时间" align="center" width="160">
@ -30,7 +30,7 @@
<div class="section"> <el-divider content-position="left">应付单明细</el-divider>
<el-table :data="detail.detailList" border stripe>
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column prop="paymentAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
<el-table-column prop="paymentAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
<el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="payableBillCode" label="采购应付单编号" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="应付单生成时间" align="center"></el-table-column>

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

@ -1,4 +1,4 @@
<template>
<template>
<div class="app-container">
<!-- 顶部按钮工具栏 -->
<div style="margin-bottom: 20px;">
@ -86,7 +86,7 @@
<h3>采购应付单</h3>
<div class="table-summary" style="margin-bottom: 10px;">
<span style="font-weight: bold; margin-right: 20px;">应付单本次核销总额: <span
style="color: #409EFF">{{ totalPayableWriteOffAmount.toFixed(2) }}</span></span>
style="color: #409EFF">{{ formatCurrency(totalPayableWriteOffAmount.toFixed(2)) }}</span></span>
</div>
<el-table
v-loading="loadingPayable"
@ -126,22 +126,22 @@
<el-table-column label="核销中含税总价(元)" align="center" prop="paidAmount" width="150">
<template slot-scope="scope">
{{
$calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount)
formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount))
}}
</template>
</el-table-column>
<el-table-column label="已核销含税总价(元)" align="center" prop="paidPaymentAmount" width="150"/>
<el-table-column label="已核销含税总价(元)" align="center" prop="paidPaymentAmount" width="150" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已核销未税总价(元)" align="center" width="150">
<template slot-scope="scope">
{{ calculateExcludingTax(scope.row.paidPaymentAmount, scope.row.taxRate) }}
{{ formatCurrency(calculateExcludingTax(scope.row.paidPaymentAmount, scope.row.taxRate)) }}
</template>
</el-table-column>
<el-table-column label="已核销税额(元)" align="center" width="120">
<template slot-scope="scope">
{{ calculateTax(scope.row.paidPaymentAmount, scope.row.taxRate) }}
{{ formatCurrency(calculateTax(scope.row.paidPaymentAmount, scope.row.taxRate)) }}
</template>
</el-table-column>
<el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
<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"
show-overflow-tooltip/>
<el-table-column label="采购应付单编号" fixed="right" align="center" prop="payableBillCode" width="150"
@ -196,14 +196,14 @@
<el-table-column label="未核销含税总价(元)" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.preResidueAmount || '0.00' }} <!-- Assuming paymentAmount is total initially -->
{{ formatCurrency(scope.row.preResidueAmount || '0.00') }} <!-- Assuming paymentAmount is total initially -->
</template>
</el-table-column>
<el-table-column label="已核销含税总价(元)" align="center" prop="writeOffAmount" width="150"/>
<el-table-column label="已核销未税总价(元)" align="center" width="150" prop="writeOffAmountWithoutTax"/>
<el-table-column label="已核销税额(元)" align="center" width="150" prop="writeOffTaxAmount"/>
<el-table-column label="已核销含税总价(元)" align="center" prop="writeOffAmount" width="150" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
<el-table-column label="已核销未税总价(元)" align="center" width="150" prop="writeOffAmountWithoutTax" :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"/>
<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"
show-overflow-tooltip/>
<el-table-column label="采购付款单号" fixed="right" align="center" prop="paymentBillCode" width="150"

4
oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
View File

@ -235,12 +235,14 @@ export default {
this.total = this.snList.length;
this.queryParams.pageNum = 1;
this.queryParams.pageSize = this.total;
this.isImported = true;
this.$nextTick(() => {
if (this.$refs.snTable) {
this.$refs.snTable.clearSelection();
this.$refs.snTable.toggleAllSelection();
this.selectedSnList = this.snList;
this.$nextTick(() => {
this.isImported = true;
});
}
});
}).catch(() => {

2
oms_web/oms_vue/src/views/manage/delivery/components/SelectOrder.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog title="选择合同" :visible.sync="visible" width="800px" append-to-body @close="cancel">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" @submit.native.prevent>
<el-form-item label="合同编号" prop="orderCode">
<el-input
v-model="queryParams.orderCode"

2
oms_web/oms_vue/src/views/manage/delivery/index.vue
View File

@ -186,7 +186,7 @@
<!-- 发货清单对话框 -->
<delivery-items ref="items"></delivery-items>
<!-- 合同详情抽屉 -->
<order-detail ref="orderDetail"></order-detail>
<!-- <order-detail ref="orderDetail"></order-detail>-->
</div>
</template>

15
oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue
View File

@ -186,7 +186,16 @@
</el-col>
</el-row>
<el-divider content-position="left" style="margin-top: 40px">
<h3 style="font-weight: bold">技术方案会审</h3>
<div style="display: flex"> <h3 style="font-weight: bold">技术方案会审</h3>
<el-button
size="mini"
type="text"
icon="el-icon-download"
@click="handleExportSingle(form)"
v-show="form.jointTrial==='1'"
>技术方案终审下载</el-button>
</div>
</el-divider>
@ -421,6 +430,10 @@ export default {
}
},
methods: {
handleExportSingle(row){
window.location.href=process.env.VUE_APP_BASE_API +`/sip/project/vue/joinTrial/export/${row.id}`
// exportSingle(row.id)
},
getDetails() {
getProject(this.projectId).then(response => {
const projectData = response.data.project;

2
oms_web/oms_vue/src/views/project/info/SelectProject.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog title="选择项目" :visible.sync="internalVisible" width="800px" height="600px" append-to-body @close="handleClose">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" @submit.native.prevent>
<el-form-item label="项目编号" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>

41
oms_web/oms_vue/src/views/project/info/index.vue
View File

@ -163,35 +163,36 @@
</template>
</el-table-column>
<el-table-column label="最终客户" align="center" prop="customerName" width="200" />
<el-table-column label="BG" align="center" prop="bgProperty" width="100">
<el-table-column label="BG" align="center" prop="bgProperty" width="70">
<template slot-scope="scope">
<dict-tag :options="dict.type.bg_type" :value="scope.row.bgProperty"/>
</template>
</el-table-column>
<el-table-column label="行业" align="center" prop="industryType" width="100">
<el-table-column label="行业" align="center" prop="industryType" width="70">
<template slot-scope="scope">
<dict-tag v-if="scope.row.bgProperty === 'YYS'" :options="dict.type.bg_yys" :value="scope.row.industryType"/>
<dict-tag v-else :options="dict.type.bg_hysy" :value="scope.row.industryType"/>
</template>
</el-table-column>
<el-table-column label="代表处" align="center" prop="agentName" width="100" />
<el-table-column label="项目把握度" align="center" prop="projectGraspDegree" width="100" />
<el-table-column label="代表处" align="center" prop="agentName" width="70" />
<el-table-column label="项目把握度" align="center" prop="projectGraspDegree" width="70" />
<el-table-column label="预计金额(元)" align="center" prop="estimatedAmount" width="120" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ formatAmountNumber(scope.row.estimatedAmount) }}</span>
</template>
</el-table-column>
<el-table-column label="项目阶段" align="center" prop="projectStage" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage"/>
</template>
</el-table-column>
<el-table-column label="汇智负责人" align="center" prop="hzSupportUserName" width="100" />
<el-table-column label="POC" align="center" prop="poc" width="100">
<el-table-column label="POC" align="center" prop="poc" width="60">
<template slot-scope="scope">
<span>{{ scope.row.poc === '1' ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="预计金额(元)" align="center" prop="estimatedAmount" width="140" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ formatAmountNumber(scope.row.estimatedAmount) }}</span>
</template>
</el-table-column>
<el-table-column label="预计下单时间" align="center" prop="estimatedOrderTime" width="140" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimatedOrderTime, '{y}-{m}-{d}') }}</span>
@ -207,18 +208,18 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="收藏" align="center" prop="collect" width="60" fixed="right">
<el-table-column label="收藏" align="center" prop="collect" width="50" fixed="right">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.collect" true-label="1" false-label="0" @change="handleCollectChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="会审" align="center" prop="jointTrial" width="60" fixed="right">
<el-table-column label="会审" align="center" prop="jointTrial" width="50" fixed="right">
<template slot-scope="scope">
<el-checkbox v-if="!canUpdateJoinTrial" :value="scope.row.jointTrial === '1'" @change="()=>{ $modal.msgError('无权限修改');return false;}" />
<el-checkbox v-else v-model="scope.row.jointTrial" true-label="1" false-label="0" @change="handleJoinTrialChange(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="400" fixed="right">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@ -242,13 +243,13 @@
@click="handleDelete(scope.row)"
v-hasPermi="['sip:project:remove']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleExportSingle(scope.row)"
v-show="scope.row.jointTrial==='1'"
>技术方案终审下载</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleExportSingle(scope.row)"-->
<!-- v-show="scope.row.jointTrial==='1'"-->
<!-- >技术方案终审下载</el-button>-->
</template>
</el-table-column>
</el-table>

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

@ -81,6 +81,17 @@
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['sip:purchaseorder:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -189,7 +200,7 @@
/>
<!-- 添加或修改采购单主表对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="80vw" append-to-body >
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="80vw" append-to-body>
<purchase-order-detail ref="purchaseOrderDetail" :order-data="currentOrderData"
@close="open = false"
@success="getList">
@ -231,10 +242,10 @@
direction="rtl"
size="80%"
>
<ApproveLayout title="采购单详情" v-if="showDetailDrawer">
<ApproveLayout title="采购单详情" v-if="showDetailDrawer">
<purchase-order-detail-view ref="detailViewOnly" :order-data="detailOrderData" @close="showDetailDrawer = false"
@success="getList" :showHistory="true"
@view-history-detail="handleViewHistoryDetailEvent">
@success="getList" :showHistory="true"
@view-history-detail="handleViewHistoryDetailEvent">
</purchase-order-detail-view>
<template #footer>
<span>订单编号: {{ currentDetailPurchaseNo }}</span>
@ -249,8 +260,9 @@
direction="rtl"
size="80%"
>
<ApproveLayout title="采购单历史详情" v-if="showHistoryDetailDrawer">
<purchase-order-detail-view ref="historyDetailView" :order-data="historyDetailOrderData" @close="showHistoryDetailDrawer = false">
<ApproveLayout title="采购单历史详情" v-if="showHistoryDetailDrawer">
<purchase-order-detail-view ref="historyDetailView" :order-data="historyDetailOrderData"
@close="showHistoryDetailDrawer = false">
</purchase-order-detail-view>
<template #footer>
<span>订单编号: {{ historyDetailOrderData ? historyDetailOrderData.purchaseNo : '' }}</span>
@ -272,11 +284,12 @@ import {
getPurchaseOrderHistory,
getPurchaseOrderHistoryDetail,
recallPurchaseorder,
vendorConfirmStatus // 导入发起供应商确认接口
vendorConfirmStatus, exportPurchaseorder // 导入发起供应商确认接口
} from "@/api/sip/purchaseorder";
import PurchaseOrderDetail from './components/PurchaseOrderDetail';
import ApproveLayout from "@/views/approve/ApproveLayout.vue";
import PurchaseOrderDetailView from "@/views/purchaseorder/components/PurchaseOrderDetailView.vue";
import {blobValidate} from "@/utils/ruoyi";
export default {
name: "Purchaseorder",
@ -333,7 +346,7 @@ export default {
approveStatus: null,
confirmStatus: null,
status: null,
orderByColumn:'createTime',
orderByColumn: 'createTime',
isAsc: 'desc'
},
// 表单参数
@ -346,7 +359,7 @@ export default {
console.log(this.$route.query)
this.getList();
},
watch:{
watch: {
// 监听对话框打开
open(val) {
if (!val) {
@ -415,6 +428,13 @@ export default {
this.open = true;
this.title = "添加采购单主表";
},
handleExport() {
this.$modal.confirm('是否确认导出已审批的采购数据项？').then(() => {
return exportPurchaseorder(this.queryParams);
}).then(response => {
this.$download.download( response.msg)
})
},
/** 修改按钮操作 */
handleUpdate(row) {
getPurchaseorder(row.id).then(response => {
@ -423,11 +443,13 @@ export default {
this.open = true;
this.title = "修改采购单主表";
});
},
}
,
/** 提交按钮 */
submitForm() {
this.$refs.purchaseOrderDetail.submitForm()
},
}
,
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
@ -438,13 +460,15 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
}
,
/** 申请采购按钮操作 */
handleApply(row) {
this.currentApplyingOrder = row; // 保存当前订单数据
this.selectedFlowType = null; // 重置选定的流程类型
this.openFlowTypeDialog = true; // 打开流程类型选择对话框
},
}
,
/** 查看详情按钮操作 */
handleViewDetails(row) {
getPurchaseorder(row.id).then(response => {
@ -452,7 +476,8 @@ export default {
this.currentDetailPurchaseNo = row.purchaseNo;
this.showDetailDrawer = true;
});
},
}
,
/** 处理查看历史详情事件 */
handleViewHistoryDetailEvent(row) {
getPurchaseOrderHistoryDetail(row.id).then(response => {
@ -460,7 +485,8 @@ export default {
this.showHistoryDetailDrawer = true;
this.showDetailDrawer = false; // 关闭当前详情抽屉
});
},
}
,
/** 提交申请采购（带流程类型） */
submitApplyWithFlowType() {
this.$refs.flowTypeForm.validate(valid => {
@ -477,7 +503,8 @@ export default {
});
}
});
},
}
,
/** 撤回按钮操作 */
handleRecall(row) {
this.$modal.confirm('是否确认撤回采购订单编号为"' + row.purchaseNo + '"的数据项？').then(() => {
@ -488,7 +515,8 @@ export default {
this.getList(); // 刷新列表以反映状态变化
}).catch(() => {
});
},
}
,
/** 发起供应商确认操作 */
handleInitiateVendorConfirmation(row) {
this.$modal.confirm('是否确认发起供应商确认编号为"' + row.purchaseNo + '"的数据项？', '警告', {

2
oms_web/oms_vue/src/views/system/agent/index.vue
View File

@ -391,7 +391,7 @@ export default {
this.$modal.confirm('是否确认导出所有办事处信息数据项？').then(() => {
return exportAgent(this.queryParams);
}).then(response => {
this.$download.name(response.msg);
this.$download.download(response.msg);
}).catch(() => {});
}
}

2
oms_web/oms_vue/src/views/system/agent/selectAgent.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog title="选择代表处" :visible.sync="visible" :close-on-click-modal="false" width="800px" append-to-body @close="handleClose">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="代表处名称" prop="agentName">
<el-input
v-model="queryParams.agentName"

2
oms_web/oms_vue/src/views/system/customer/index.vue
View File

@ -491,7 +491,7 @@ export default {
this.$modal.confirm('是否确认导出所有客户信息数据项？').then(() => {
return exportCustomer(this.queryParams);
}).then(response => {
this.$download.name(response.msg);
this.$download.download(response.msg);
}).catch(() => {});
}
}

2
oms_web/oms_vue/src/views/system/customer/selectCustomer.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog title="选择客户" :close-on-click-modal="false" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="queryParams.customerName"

2
oms_web/oms_vue/src/views/system/partner/index.vue
View File

@ -514,7 +514,7 @@ export default {
this.$modal.confirm('是否确认导出所有代理商管理数据项？').then(() => {
return exportPartner(this.queryParams);
}).then(response => {
this.$download.name(response.msg);
this.$download.download(response.msg);
}).catch(() => {});
},
/** 打开选择用户对话框 */

10
oms_web/oms_vue/src/views/system/partner/selectPartner.vue
View File

@ -1,12 +1,12 @@
<template>
<el-dialog title="选择进货商" :close-on-click-modal="false" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="进货商名称" prop="partnerName">
<el-input
v-model="queryParams.partnerName"
placeholder="请输入进货商名称"
clearable
@keyup.enter.native="handleQuery"
@keyup.enter.native.prevent="handleQuery"
/>
</el-form-item>
<el-form-item>
@ -70,9 +70,9 @@ export default {
}
},
},
created() {
this.getList();
},
// created() {
// this.getList();
// },
methods: {
/** 查询进货商列表 */
getList() {

2
oms_web/oms_vue/src/views/system/product/selectProduct.vue
View File

@ -1,7 +1,7 @@
<template>
<el-dialog title="选择产品" :close-on-click-modal="false" :visible.sync="visible" width="60%" append-to-body @close="handleClose">
<div style="max-height: 60vh; overflow-y: auto;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"

2
oms_web/oms_vue/src/views/system/role/selectUser.vue
View File

@ -1,7 +1,7 @@
<template>
<!-- 授权用户 -->
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"

2
oms_web/oms_vue/src/views/system/user/selectUser.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog title="选择用户" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -62,6 +62,7 @@ public class CommonController
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, realFileName);
response.setHeader("download-filename", FileUtils.percentEncode(realFileName));
FileUtils.writeBytes(filePath, response.getOutputStream());
if (delete)
{

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -465,6 +465,20 @@ public class SysUserController extends BaseController
}
return toAjax(userService.deleteUserByIds(ids));
}
/**
* 用户授权角色
*/
@Log(title = "用户管理", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
@ResponseBody
public AjaxResult authRole(Long userId, Long[] roleIds)
{
userService.checkUserDataScope(userId);
roleService.checkRoleDataScope(roleIds);
userService.insertUserAuth(userId, roleIds);
AuthorizationUtils.clearAllCachedAuthorizationInfo();
return success();
}
// ----------------------新增的个人信息 业务处理---------------------------
// /**
// * 个人信息

3
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
View File

@ -115,6 +115,9 @@ public class OmsPaymentBillController extends BaseController
{
List<OmsPaymentBill> list = omsPaymentBillService.selectOmsPaymentBillList(omsPaymentBill);
ExcelUtil<OmsPaymentBill> util = new ExcelUtil<OmsPaymentBill>(OmsPaymentBill.class);
todoService.fillApproveNode(list,
Arrays.asList(processConfig.getDefinition().getFinancePayment(), processConfig.getDefinition().getFinanceRefund())
, OmsPaymentBill::getPaymentBillCode, (a, b) -> a.setApproveNode(b.get(a.getPaymentBillCode())));
return util.exportExcel(list, "采购付款单数据");
}

5
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java
View File

@ -141,12 +141,13 @@ public class OmsPurchaseOrderController extends BaseController
// @RequiresPermissions("sip:purchaseorder:export")
@Anonymous
@GetMapping("/export")
public void export(OmsPurchaseOrder omsPurchaseOrder, HttpServletResponse response)
public AjaxResult export(OmsPurchaseOrder omsPurchaseOrder, HttpServletResponse response)
{
omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_COMPLETE.getCode());
List<OmsPurchaseOrder> list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
todoService.fillPurchaseOrderApproveNode(list);
ExcelUtil<OmsPurchaseOrder> util = new ExcelUtil<OmsPurchaseOrder>(OmsPurchaseOrder.class);
util.exportExcel(response, list, "采购单主表数据");
return util.exportExcel( list, "采购单主表数据");
}
/**

21
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
View File

@ -32,17 +32,18 @@ public class OmsPaymentBill extends BaseEntity
private List<String> paymentBillCodeList;
/** 付款单类型 (FROM_PAYABLE, PRE_PAYMENT) */
@Excel(name = "付款单类型 (FROM_PAYABLE, PRE_PAYMENT)")
@Excel(name = "备注", readConverterExp = "FROM_PAYABLE=应付单生成,PRE_PAYMENT=预付单,REFUND=退款单")
private String paymentBillType;
/** 付款时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "预计付款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date paymentTime;
/** 制造商名称 */
@Excel(name = "制造商名称")
private String vendorCode;
@Excel(name = "制造商名称")
private String vendorName;
/** 合同编号 */
@ -73,7 +74,7 @@ public class OmsPaymentBill extends BaseEntity
private String projectName;
/** 预付单剩余额度 */
@Excel(name = "预付单剩余额度")
// @Excel(name = "预付单剩余额度")
private BigDecimal preResidueAmount;
/** 实际付款时间 */
@ -82,11 +83,11 @@ public class OmsPaymentBill extends BaseEntity
private Date actualPaymentTime;
/** 付款状态 */
@Excel(name = "付款状态")
@Excel(name = "付款状态",dictType = "payment_status")
private String paymentStatus;
/** 审批状态 */
@Excel(name = "审批状态")
@Excel(name = "审批状态",dictType = "approve_status")
private String approveStatus;
/** 审批节点 */
@ -99,7 +100,7 @@ public class OmsPaymentBill extends BaseEntity
private Date approveTime;
/** 支付方式 */
@Excel(name = "支付方式")
@Excel(name = "支付方式",dictType = "payment_method")
private String paymentMethod;
/** 应付单编号（关联查询字段） */
@ -144,6 +145,12 @@ public class OmsPaymentBill extends BaseEntity
private BigDecimal writeOffAmountWithoutTax;
private BigDecimal writeOffTaxAmount;
/** 附件ID，多个以逗号分隔 */
private String fileId;
/** 附件列表 */
private List<OmsFileLog> fileList;
@Getter
public enum PaymentBillTypeEnum {

10
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java
View File

@ -40,7 +40,7 @@ public class OmsPurchaseOrder extends BaseEntity
private String buyerAddress;
/** 制造商ID */
@Excel(name = "制造商ID")
// @Excel(name = "制造商ID")
private Long vendorId;
private String vendorCode;
private List<String> authVendorCodeList;
@ -55,7 +55,7 @@ public class OmsPurchaseOrder extends BaseEntity
private String currency;
/** 采购员ID */
@Excel(name = "采购员ID")
// @Excel(name = "采购员ID")
private Long purchaserId;
@ -81,7 +81,7 @@ public class OmsPurchaseOrder extends BaseEntity
private String payMethod;
/** 汇智负责人ID */
@Excel(name = "汇智负责人ID")
// @Excel(name = "汇智负责人ID")
private Long ownerId;
/** 汇智负责人姓名 */
@ -101,7 +101,7 @@ public class OmsPurchaseOrder extends BaseEntity
private String approveStatus;
/** 审批时间 */
@Excel(name = "审批时间")
@Excel(name = "审批时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date approveTime;
/** 当前审批节点 */
@ -127,6 +127,8 @@ public class OmsPurchaseOrder extends BaseEntity
private String processKey;
private String todoId;
private String taskId;
private String productCode;
private String productModel;
private Integer fileId;
private OmsFileLog fileLog;

2
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
View File

@ -138,6 +138,8 @@ public class ProjectOrderInfo extends BaseEntity {
private String partnerName;
private String partnerAddress;
private String projectPartnerName;
private String productModel;
private String productCode;
private List<String> productCodeList;
/**

22
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
@ -84,6 +85,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
* @return 产品库存
*/
@Override
@DataScope(deptAlias = "t8", userAlias = "t8")
public List<InventoryDelivery> selectInventoryDeliveryList(InventoryDelivery inventoryDelivery) {
return inventoryDeliveryMapper.selectInventoryDeliveryList(inventoryDelivery);
}
@ -114,7 +116,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//修改数据的时候同步修改出库价
BigDecimal bigDecimal = inventoryOuterMapper.selectOutPriceByCode(inventoryDelivery.getOuterCode());
List<OmsInventoryDeliveryDetail> detailList=new ArrayList<>();
List<OmsInventoryDeliveryDetail> detailList = new ArrayList<>();
if (CollUtil.isEmpty(productSnDataList)) {
List<InventoryInfo> inventoryInfoList = productSnList.stream().map(item -> {
InventoryInfo info = new InventoryInfo();
@ -131,7 +133,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
return info;
}).collect(Collectors.toList());
inventoryInfoService.saveBatch(inventoryInfoList);
}else{
} else {
for (InventoryInfo inventoryInfo : productSnDataList) {
inventoryInfo.setInventoryStatus(InventoryInfo.InventoryStatusEnum.OUTER.getCode());
inventoryInfo.setOuterCode(inventoryDelivery.getOuterCode());
@ -142,7 +144,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
detail.setProductSn(inventoryInfo.getProductSn());
detailList.add(detail);
}
omsInventoryInnerService.importByOuter(productSnDataList,inventoryDelivery.getProductCode(),inventoryDelivery.getPurchaseNo(),inventoryDelivery.getItemId());
omsInventoryInnerService.importByOuter(productSnDataList, inventoryDelivery.getProductCode(), inventoryDelivery.getPurchaseNo(), inventoryDelivery.getItemId());
}
InventoryOuterDetail inventoryOuterDetail = new InventoryOuterDetail();
inventoryOuterDetail.setId(inventoryDelivery.getDetailId());
@ -151,7 +153,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//todo 限制只能发一次货 防止重复发货
int i = inventoryDeliveryMapper.insertInventoryDelivery(inventoryDelivery);
if (CollUtil.isNotEmpty(detailList)){
if (CollUtil.isNotEmpty(detailList)) {
for (OmsInventoryDeliveryDetail detail : detailList) {
detail.setDeliveryId(inventoryDelivery.getId());
}
@ -231,7 +233,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode());
projectOrderInfoService.updateProjectOrderInfoByCode(updateOrder);
//新增计收数据
if (sum==allSum){
if (sum == allSum) {
//新增计收数据
OmsFinanceCharge omsFinanceCharge = new OmsFinanceCharge();
omsFinanceCharge.setOrderCode(inventoryDelivery.getOrderCode());
@ -298,7 +300,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
InventoryDelivery inventoryDelivery1 = selectInventoryDeliveryById(inventoryDelivery.getId());
BigDecimal allPrice = price.multiply(new BigDecimal(inventoryDelivery1.getQuantity().toString()));
receivableBill.setTotalPriceWithTax(allPrice);
BigDecimal defaultTaxRate = projectProductInfo.getTaxRate()==null?new BigDecimal(defaultTax):projectProductInfo.getTaxRate().divide(new BigDecimal("100"));
BigDecimal defaultTaxRate = projectProductInfo.getTaxRate() == null ? new BigDecimal(defaultTax) : projectProductInfo.getTaxRate().divide(new BigDecimal("100"));
BigDecimal allPriceWithOutTax = allPrice.divide(BigDecimal.ONE.add(defaultTaxRate), 2, RoundingMode.HALF_UP);
receivableBill.setTaxRate(defaultTaxRate);
receivableBill.setTotalPriceWithoutTax(allPriceWithOutTax);
@ -330,7 +332,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
public List<DeliveryInfoVo> getNumberInfo(ApiDataQueryDto dto) {
List<DeliveryInfoVo> resultList = inventoryDeliveryMapper.listSn(dto);
List<String> orderCodeList = resultList.stream().map(DeliveryInfoVo::getOrderCode).collect(Collectors.toList());
if (CollUtil.isEmpty(orderCodeList)){
if (CollUtil.isEmpty(orderCodeList)) {
return Collections.emptyList();
}
// 根据订单ID查询合同信息
@ -358,7 +360,6 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//todo 判断应付或应收状态 不允许退
InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id);
deleteInventoryOuterById(id);
List<ProjectProductInfo> projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode()));
@ -400,14 +401,14 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
InventoryDelivery dbData = inventoryDeliveryMapper.selectInventoryDeliveryById(inventoryDelivery.getId());
List<OmsInventoryDeliveryDetail> omsInventoryDeliveryDetails = deliveryDetailService.selectOmsInventoryDeliveryDetailByDeliveryId(dbData.getId());
InventoryInfo queryParams = new InventoryInfo();
if (CollUtil.isNotEmpty(omsInventoryDeliveryDetails)){
if (CollUtil.isNotEmpty(omsInventoryDeliveryDetails)) {
queryParams.setProductSnList(omsInventoryDeliveryDetails.stream()
.map(OmsInventoryDeliveryDetail::getProductSn).collect(Collectors.toList()));
}
queryParams.setOuterCode(dbData.getOuterCode());
queryParams.setWarehouseId(dbData.getWarehouseId());
List<InventoryInfo> inventoryInfos = inventoryInfoService.selectInventoryInfoList(queryParams);
return inventoryInfos.stream().map(item->{
return inventoryInfos.stream().map(item -> {
InventoryDeliveryDetailExcelDto detailExcelDto = new InventoryDeliveryDetailExcelDto();
detailExcelDto.setProductSn(item.getProductSn());
detailExcelDto.setProductCode(item.getProductCode());
@ -468,6 +469,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
private Date updateStartTimeAndAddList(DeliveryInfoVo deliveryInfoVo, ProjectProductInfo productInfo, Date startTime, List<DeliveryInfoVo.ServiceInfo> serviceInfoList) {
int year = productInfo.getValue() == null ? 0 : Integer.parseInt(productInfo.getValue());
year = Math.toIntExact(year * (productInfo.getQuantity() == null ? 1 : productInfo.getQuantity()));
DeliveryInfoVo.ServiceInfo serviceInfo = deliveryInfoVo.new ServiceInfo();
serviceInfo.setServiceLevel(productInfo.getProductBomCode());
serviceInfo.setServiceDescribe(productInfo.getProductDesc());

29
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
View File

@ -69,6 +69,8 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
protected ManagementService managementService;
@Autowired
private IOmsPayableWriteOffService writeOffService;
@Autowired
private IOmsFileLogService omsFileLogService;
/**
* 查询采购付款单
*
@ -78,7 +80,20 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
@Override
public OmsPaymentBill selectOmsPaymentBillById(Long id)
{
return omsPaymentBillMapper.selectOmsPaymentBillById(id);
OmsPaymentBill omsPaymentBill = omsPaymentBillMapper.selectOmsPaymentBillById(id);
if (omsPaymentBill != null && StrUtil.isNotEmpty(omsPaymentBill.getFileId())) {
List<Integer> idList = StrUtil.split(omsPaymentBill.getFileId(), ',')
.stream()
.map(Integer::valueOf)
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(idList)) {
OmsFileLog query = new OmsFileLog();
query.setIdList(idList);
List<OmsFileLog> fileList = omsFileLogService.queryAll(query);
omsPaymentBill.setFileList(fileList);
}
}
return omsPaymentBill;
}
/**
@ -186,6 +201,18 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
@Override
public PaymentBillDetailDTO query(Long id) {
PaymentBillDetailDTO paymentBillDetailDTO = omsPaymentBillMapper.selectPaymentBillDetail(id);
if (paymentBillDetailDTO != null && StrUtil.isNotEmpty(paymentBillDetailDTO.getFileId())) {
List<Integer> idList = StrUtil.split(paymentBillDetailDTO.getFileId(), ',')
.stream()
.map(Integer::valueOf)
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(idList)) {
OmsFileLog query = new OmsFileLog();
query.setIdList(idList);
List<OmsFileLog> fileList = omsFileLogService.queryAll(query);
paymentBillDetailDTO.setFileList(fileList);
}
}
List<PaymentBillPayableDetailDTO> paymentBillPayableDetailDTOS = detailService.listPayableByPaymentCode(paymentBillDetailDTO.getPaymentBillCode());
paymentBillDetailDTO.setPayableDetails(paymentBillPayableDetailDTOS);
return paymentBillDetailDTO;

6
ruoyi-sip/src/main/resources/mapper/finance/OmsPaymentBillMapper.xml
View File

@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="payBankNumber" column="pay_bank_number" />
<result property="payBankOpenAddress" column="pay_bank_open_address" />
<result property="bankNumber" column="bank_number" />
<result property="fileId" column="file_id" />
<result property="refundStatus" column="refund_status" />
</resultMap>
@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pb.pay_bank_number,
pb.pay_bank_open_address,
pb.bank_number,
pb.file_id,
pb.refund_status,
ovi.vendor_name,
ovi.pay_type,
@ -270,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="payBankNumber != null">pay_bank_number,</if>
<if test="payBankOpenAddress != null">pay_bank_open_address,</if>
<if test="bankNumber != null">bank_number,</if>
<if test="fileId != null">file_id,</if>
<if test="refundStatus != null">refund_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -300,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="payBankNumber != null">#{payBankNumber},</if>
<if test="payBankOpenAddress != null">#{payBankOpenAddress},</if>
<if test="bankNumber != null">#{bankNumber},</if>
<if test="fileId != null">#{fileId},</if>
<if test="refundStatus != null">#{refundStatus},</if>
</trim>
</insert>
@ -334,6 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="payBankNumber != null">pay_bank_number = #{payBankNumber},</if>
<if test="payBankOpenAddress != null">pay_bank_open_address = #{payBankOpenAddress},</if>
<if test="bankNumber != null">bank_number = #{bankNumber},</if>
<if test="fileId != null">file_id = #{fileId},</if>
<if test="refundStatus != null">refund_status = #{refundStatus},</if>
</trim>

4
ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
View File

@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join project_info t5 on t4.project_id=t5.id
left join sys_user t6 on t1.create_by = t6.user_id
left join product_info t7 on t3.product_code = t7.product_code
left join sys_user t8 on t4.duty = t8.user_id
</sql>
<select id="selectInventoryDeliveryList" parameterType="InventoryDelivery" resultMap="InventoryDeliveryResult">
@ -62,7 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectName != null and projectName != ''">and t5.project_name like
concat('%',#{projectName},'%')
</if>
${params.authSql}
${params.dataScope}
</where>
</select>
<select id="selectInventoryDeliveryById" parameterType="Long" resultMap="InventoryDeliveryResult">

6
ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
View File

@ -158,6 +158,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entity.purchaseNo != null and entity.purchaseNo != ''"> and t1.purchase_no = #{entity.purchaseNo}</if>
<if test="entity.vendorName != null "> and t2.vendor_name = #{entity.vendorName}</if>
<if test="entity.ownerName != null "> and t1.owner_name = #{entity.ownerName}</if>
<if test="entity.productCode != null and entity.productCode != ''">
and t1.id in (select distinct purchase_id from oms_purchase_order_item where product_code like concat(#{entity.productCode },'%'))
</if>
<if test="entity.productModel != null and entity.productModel != '' ">
and t1.id in (select distinct purchase_id from oms_purchase_order_item t1 left join product_info t2 on t1.product_code=t2.product_code where t2.model like concat(#{entity.productModel },'%'))
</if>
<!-- <if test="entity.approveUser != null "> and t3.approve_user = #{entity.approveUser}</if>-->
<if test="entity.params.applyTimeStart != null and entity.params.applyTimeEnd != ''">
<choose>

20
ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
View File

@ -266,6 +266,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
)
</if>
<if test="productCode!=null and productCode!=''">
and t1.project_id in (select distinct t2.project_id from project_product_info t2 where t2.product_bom_code
like concat('%',#{productCode},'%')
)
</if>
<if test="productModel!=null and productModel!=''">
and t1.project_id in (select distinct t2.project_id from project_product_info t2 where t2.model like
concat('%',#{productModel},'%'))
</if>
${params.authSql}
${params.dataScope}
</select>
@ -518,6 +528,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
)
</if>
<if test="productCode!=null and productCode!=''">
and t1.project_id in (select distinct t2.project_id from project_product_info t2 where t2.product_bom_code
like concat('%',#{productCode},'%')
)
</if>
<if test="productModel!=null and productModel!=''">
and t1.project_id in (select distinct t2.project_id from project_product_info t2 where t2.model like
concat('%',#{productModel},'%'))
</if>
${params.authSql}
${params.dataScope}
</select>