DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(crm): 重构合同模块为订单模块并优化相关功能

Browse Source 
重构合同模块为订单模块，包括以下主要变更：
1. 将合同编号字段从contractNo统一改为contractCode
2. 在CrmOrderBo中添加日期格式化注解
3. 重构ContractTabs组件为订单详情页
4. 添加销售员字段和相关选择器
5. 优化订单列表查询条件和展示
6. 调整订单附件管理功能
This commit is contained in:
砂糖
2026-04-13 17:48:19 +08:00
parent c3d6d7cece
commit 9f3d402174
7 changed files with 187 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
View File

@@ -9,7 +9,7 @@
<span>订单信息</span>
<el-button @click.stop="openOrderDialog" style="margin-left: 10px;" plain
:type="formData.orderId ? 'success' : 'default'">
{{ formData.orderId ? formData.orderCode : '选择订单' }}
{{ formData.orderId ? formData.contractCode : '选择订单' }}
</el-button>
<div v-if="formData.orderId" @click.stop="openOrderAttachmentDialog" style="margin-left: 10px; cursor: pointer; color: #409eff;"
type="primary">
@@ -210,14 +210,14 @@
<div class="order-dialog-content">
<!-- 筛选条件 -->
<el-form :model="orderQueryParams" ref="orderQueryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="合同号">
<!-- <el-form-item label="合同号">
<el-select v-model="orderQueryParams.contractId" placeholder="请选择合同">
<el-option v-for="contract in contractList" :key="contract.contractId" :label="contract.contractNo"
:value="contract.contractId" />
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="orderQueryParams.orderCode" placeholder="请输入订单号" style="width: 180px" />
</el-form-item> -->
<el-form-item label="合同号" prop="contractCode">
<el-input v-model="orderQueryParams.contractCode" placeholder="请输入合同号" style="width: 180px" />
</el-form-item>
<el-form-item label="客户">
<el-input v-model="orderQueryParams.customerName" placeholder="请输入客户名称" style="width: 180px" />
@@ -234,7 +234,7 @@
<!-- 订单列表 -->
<el-table v-loading="orderLoading" :data="orderList" style="width: 100%" @row-click="handleOrderSelect">
<el-table-column type="selection" width="55" />
<el-table-column prop="orderCode" label="订单号" width="150" />
<!-- <el-table-column prop="orderCode" label="订单号" width="150" /> -->
<el-table-column prop="orderType" label="订单类型" width="100" />
<el-table-column prop="contractCode" label="合同号" width="150" />
<el-table-column prop="companyName" label="客户" width="180" />
@@ -365,7 +365,7 @@ export default {
openOrderDialog() {
this.dialogVisible = true;
// 加载合同列表
this.getContractList();
// this.getContractList();
// 加载订单列表
this.getOrderList();
},
@@ -379,13 +379,13 @@ export default {
return;
}
const order = await getOrder(this.formData.orderId);
if (!order.data.contractId) {
this.$message.error('未找到合同')
return;
}
// if (!order.data.contractId) {
// this.$message.error('未找到合同')
// return;
// }
// 根据合同id拿到合同详情
const contract = await getContract(order.data.contractId);
this.contract = contract.data;
// const contract = await getContract(order.data.contractId);
this.contract = order.data;
} catch {
this.$message.error('获取合同附件失败')
} finally {
@@ -393,11 +393,11 @@ export default {
}
},
/** 获取合同列表 */
getContractList() {
listContract().then(response => {
this.contractList = response.rows;
});
},
// getContractList() {
// listContract().then(response => {
// this.contractList = response.rows;
// });
// },
/** 获取订单列表 */
getOrderList() {
this.orderLoading = true;