feat(crm): 合同含税总金额自动填入订单总金额 & 移除冗余页面

- feat(crm/contract): 含税总额变化后自动填写订单总金额(可配置开关)
- fix(crm/receive): 修复金额单位错误(万元→元);清理未使用导入
- fix(contract/product): 产品备注设置默认值
- chore: 移除已废弃的 OrderDashboard 组件和 finance/order 页面
- feat(wms/hrm): 新增考勤异常管理页面(attendanceAbnormal.vue)
- chore: 移除 trae git 提交规则配置
This commit is contained in:
2026-06-06 13:01:38 +08:00
parent 724c1dd16f
commit 050dd1a965
7 changed files with 901 additions and 381 deletions

View File

@@ -1,9 +1,9 @@
<template>
<div>
<el-descriptions :column="3" title="财务状态" border>
<el-descriptions-item label="订单总金额">{{ order.orderAmount }}</el-descriptions-item>
<el-descriptions-item label="已收款金额">{{ receivedAmount }}</el-descriptions-item>
<el-descriptions-item label="未收款金额">{{ unreceivedAmount }}</el-descriptions-item>
<el-descriptions-item label="订单总金额">{{ order.orderAmount }}</el-descriptions-item>
<el-descriptions-item label="已收款金额">{{ receivedAmount }}</el-descriptions-item>
<el-descriptions-item label="未收款金额">{{ unreceivedAmount }}</el-descriptions-item>
</el-descriptions>
<el-descriptions title="收款明细"></el-descriptions>
@@ -137,8 +137,7 @@
</template>
<script>
import { listReceivable, getReceivable, delReceivable, addReceivable, updateReceivable, updatePaidAmount } from "@/api/finance/receivable";
import { updateOrder } from "@/api/crm/order";
import { listReceivable, getReceivable, delReceivable, addReceivable, updateReceivable, updatePaidAmount } from "@/api/finance/receivable"
export default {
name: "Receivable",

View File

@@ -242,12 +242,12 @@ export default {
Object.assign(item, calculateProductFields(item, 'quantity'));
});
this.products = products;
this.remark = data.remark || '';
this.remark = data.remark || '净边料/毛边料、简包/裸包、卷重结算';
this.productName = data.productName || '';
} catch (error) {
console.error('解析content失败:', error);
this.products = [{}];
this.remark = '';
this.remark = '净边料/毛边料、简包/裸包、卷重结算';
}
},
// 数量变更

View File

@@ -89,6 +89,9 @@
</el-col>
</el-row>
<el-form-item>
<el-checkbox v-model="autoFillOrderAmount">含税总额变化后自动填写订单总金额</el-checkbox>
</el-form-item>
<el-form-item label="产品内容">
<ProductContent v-model="form.productContent" :readonly="false" />
</el-form-item>
@@ -233,6 +236,8 @@ export default {
},
// 表单参数
form: {},
// 是否自动将含税总额填入订单总金额
autoFillOrderAmount: true,
// 导出预览
exportDialogVisible: false,
exportRow: null,
@@ -314,6 +319,19 @@ export default {
created() {
this.getDictList();
},
watch: {
'form.productContent': function (newVal) {
if (!this.autoFillOrderAmount || !newVal) return;
try {
const data = JSON.parse(newVal);
if (data.totalTaxTotal != null) {
this.form.orderAmount = data.totalTaxTotal;
}
} catch (e) {
// ignore parse errors
}
}
},
methods: {
/** 处理客户选择 */
handleCustomerChange(customer) {