refactor(crm): 客户ID字段类型从字符串改为长整型
- 将CrmCustomer实体类中的customerId字段从String类型改为Long类型 - 将CrmCustomerBo业务对象中的customerId字段从String类型改为Long类型 - 将CrmCustomerVo视图对象中的customerId字段从String类型改为Long类型 - 在预订单页面为操作按钮添加orderType条件判断 - 修复代码缩进格式问题
This commit is contained in:
@@ -23,7 +23,7 @@ public class CrmCustomer extends BaseEntity {
|
|||||||
* 客户ID(主键)
|
* 客户ID(主键)
|
||||||
*/
|
*/
|
||||||
@TableId(value = "customer_id")
|
@TableId(value = "customer_id")
|
||||||
private String customerId;
|
private Long customerId;
|
||||||
/**
|
/**
|
||||||
* 客户统一编码
|
* 客户统一编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public class CrmCustomerBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 客户ID(主键)
|
* 客户ID(主键)
|
||||||
*/
|
*/
|
||||||
private String customerId;
|
private Long customerId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 客户统一编码
|
* 客户统一编码
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ public class CrmCustomerVo {
|
|||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "客户ID", converter = ExcelDictConvert.class)
|
@ExcelProperty(value = "客户ID", converter = ExcelDictConvert.class)
|
||||||
@ExcelDictFormat(readConverterExp = "主=键")
|
@ExcelDictFormat(readConverterExp = "主=键")
|
||||||
private String customerId;
|
private Long customerId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 客户统一编码
|
* 客户统一编码
|
||||||
|
|||||||
@@ -94,18 +94,21 @@
|
|||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
|
v-if="scope.row.orderType === 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-check"
|
icon="el-icon-check"
|
||||||
@click.stop="handleApprove(scope.row)"
|
@click.stop="handleApprove(scope.row)"
|
||||||
>审批</el-button>
|
>审批</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
v-if="scope.row.orderType === 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-edit"
|
icon="el-icon-edit"
|
||||||
@click.stop="handleUpdate(scope.row)"
|
@click.stop="handleUpdate(scope.row)"
|
||||||
>修改</el-button>
|
>修改</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
v-if="scope.row.orderType === 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
@@ -269,7 +272,7 @@ export default {
|
|||||||
this.getList();
|
this.getList();
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 表单重置
|
// 表单重置
|
||||||
|
|||||||
Reference in New Issue
Block a user