yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(crm):修复报价单编辑的路由名称， 添加报价单和供应商信息创建人及创建时间字段单信息

Browse Source 
- 在报价页面添加创建人和创建时间列
- 在供应商信息页面添加创建时间和创建人列
- 更新项目计划页面创建人字段映射
- 扩展报价单、供应商和项目计划的类型定义，增加 createName 字段
- 调整列配置，将创建人和创建时间设置为默认可见
-修复字段映射不一致问题，统一使用 createName作为创建人字段名
dev
zangch@mesnac.com 1 month ago
parent 46eae9c5d4
commit 6100cfca42
7 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File

15
src/api/oa/crm/crmQuoteInfo/types.ts
Unescape Escape View File

@ -189,6 +189,11 @@ export interface CrmQuoteInfoVO {
*/
itemsVo?: CrmQuoteMaterialVO[];
/**
* 创建人别称
*/
createName?: string;
}
export interface CrmQuoteInfoForm extends BaseEntity {
@ -382,6 +387,11 @@ export interface CrmQuoteInfoForm extends BaseEntity {
*/
supplierName?: string;
/**
* 创建人别称
*/
createName?: string;
}
export interface CrmQuoteInfoQuery extends PageQuery {
@ -566,6 +576,11 @@ export interface CrmQuoteInfoQuery extends PageQuery {
*/
supplierName?: string;
/**
* 创建人别称
*/
createName?: string;
}

16
src/api/oa/crm/crmSupplierInfo/types.ts
Unescape Escape View File

@ -134,6 +134,11 @@ export interface CrmSupplierInfoVO {
*/
ownerName?: string;
/**
* 创建人别称
*/
createName?: string;
}
export interface CrmSupplierInfoForm extends BaseEntity {
@ -272,6 +277,11 @@ export interface CrmSupplierInfoForm extends BaseEntity {
*/
ownerName?: string;
/**
* 创建人别称
*/
createName?: string;
}
export interface CrmSupplierInfoQuery extends PageQuery {
@ -405,6 +415,12 @@ export interface CrmSupplierInfoQuery extends PageQuery {
* 归属人员名称
*/
ownerName?: string;
/**
* 创建人别称
*/
createName?: string;
}

18
src/api/oa/erp/erpProjectPlan/types.ts
Unescape Escape View File

@ -78,6 +78,12 @@ export interface ErpProjectPlanVO {
* 合同名称
*/
contractName?: string;
/**
* 创建人别称
*/
createName?: string;
}
export interface ErpProjectPlanForm extends BaseEntity {
@ -155,6 +161,12 @@ export interface ErpProjectPlanForm extends BaseEntity {
* 流程业务扩展信息
*/
bizExt?: any;
/**
* 创建人别称
*/
createName?: string;
}
export interface ErpProjectPlanQuery extends PageQuery {
@ -208,6 +220,12 @@ export interface ErpProjectPlanQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
/**
* 创建人别称
*/
createName?: string;
}

1
src/router/index.ts
Unescape Escape View File

@ -127,6 +127,7 @@ export const constantRoutes: RouteRecordRaw[] = [
path: 'crmQuoteInfo/edit',
component: () => import('@/views/oa/crm/crmQuoteInfo/edit.vue'),
name: 'crmQuoteInfoEdit',
meta: { title: '报价单编辑', activeMenu: '/oa/crm/crmQuoteInfo' }
}
]
},

21
src/views/oa/crm/crmQuoteInfo/index.vue
Unescape Escape View File

@ -244,6 +244,12 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[35].visible"/>
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[36].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[37].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="查看" placement="top">
@ -517,12 +523,13 @@ const columns = ref<FieldOption[]>([
{ key: 33, label: `报价单状态`, visible: false },
{ key: 34, label: `流程状态`, visible: false },
{ key: 35, label: `备注`, visible: true },
// { key: 36, label: `删除标志`, visible: true },
// { key: 37, label: `创建部门`, visible: true },
// { key: 38, label: `创建人`, visible: true },
// { key: 40, label: `创建时间`, visible: true },
// { key: 41, label: `更新人`, visible: true },
// { key: 42, label: `更新时间`, visible: true },
{ key: 36, label: `创建人`, visible: true },
{ key: 37, label: `创建时间`, visible: true },
// { key: 38, label: `删除标志`, visible: true },
// { key: 39, label: `创建部门`, visible: true },
// { key: 40, label: `更新人`, visible: true },
// { key: 41, label: `更新时间`, visible: true },
]);
const initFormData: CrmQuoteInfoForm = {
@ -562,6 +569,7 @@ const initFormData: CrmQuoteInfoForm = {
quoteStatus: undefined,
flowStatus: undefined,
remark: undefined,
createName: undefined,
}
const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
form: {...initFormData},
@ -602,6 +610,7 @@ const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
ossId: undefined,
quoteStatus: undefined,
flowStatus: undefined,
createName: undefined,
params: {
}
},

16
src/views/oa/crm/crmSupplierInfo/index.vue
Unescape Escape View File

@ -151,6 +151,12 @@
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[27].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[28].visible"/>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -422,12 +428,8 @@
{ key: 24, label: `附件ID`, visible: false },
{ key: 25, label: `备注`, visible: true },
{ key: 26, label: `激活标识`, visible: true },
{ key: 27, label: `删除标志`, visible: false },
{ key: 28, label: `创建部门`, visible: false },
{ key: 29, label: `创建人`, visible: true },
{ key: 30, label: `创建时间`, visible: true },
{ key: 31, label: `更新人`, visible: false },
{ key: 32, label: `更新时间`, visible: false },
{ key: 27, label: `创建时间`, visible: true },
{ key: 28, label: `创建人`, visible: true },
]);
const initFormData: CrmSupplierInfoForm = {
@ -458,6 +460,7 @@
remark: undefined,
activeFlag: undefined,
ownerName: undefined,
createName: undefined,
}
const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({
form: {...initFormData},
@ -489,6 +492,7 @@
ossId: undefined,
activeFlag: undefined,
ownerName: undefined,
createName: undefined,
params: {
}
},

4
src/views/oa/erp/erpProjectPlan/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[12].visible"/>
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[12].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -237,6 +237,7 @@
contractId: undefined,
remark: undefined,
activeFlag: undefined,
createName: undefined,
}
const data = reactive<PageData<ErpProjectPlanForm, ErpProjectPlanQuery>>({
form: {...initFormData},
@ -252,6 +253,7 @@
sortOrder: undefined,
contractId: undefined,
activeFlag: undefined,
createName: undefined,
params: {
}
},

Write Preview
Loading…
Cancel
Save