diff --git a/src/api/oa/erp/erpProjectChange/types.ts b/src/api/oa/erp/erpProjectChange/types.ts index 2a88423..0453c39 100644 --- a/src/api/oa/erp/erpProjectChange/types.ts +++ b/src/api/oa/erp/erpProjectChange/types.ts @@ -124,6 +124,11 @@ export interface ErpProjectChangeVO { */ projectChangeId: string | number; + /** + * 项目变更编号 + */ + projectChangeCode: string; + /** * 项目ID */ @@ -267,6 +272,11 @@ export interface ErpProjectChangeForm extends BaseEntity { */ projectChangeId?: string | number; + /** + * 项目变更编号 + */ + projectChangeCode?: string; + /** * 项目ID */ @@ -416,6 +426,11 @@ export interface ErpProjectChangeForm extends BaseEntity { export interface ErpProjectChangeQuery extends PageQuery { + /** + * 项目变更编号 + */ + projectChangeCode?: string; + /** * 项目ID */ diff --git a/src/api/oa/erp/erpProjectPlan/types.ts b/src/api/oa/erp/erpProjectPlan/types.ts index 699b058..4fb8173 100644 --- a/src/api/oa/erp/erpProjectPlan/types.ts +++ b/src/api/oa/erp/erpProjectPlan/types.ts @@ -9,6 +9,11 @@ export interface ErpProjectPlanVO { */ projectId: string | number; + /** + * 项目计划编号 + */ + projectPlanCode?: string; + /** * 项目经理 */ @@ -44,6 +49,11 @@ export interface ErpProjectPlanVO { */ contractId: string | number; + /** + * 附件ID + */ + ossId?: string; + /** * 备注 */ @@ -84,6 +94,11 @@ export interface ErpProjectPlanVO { */ createName?: string; + /** + * 项目经理部门名称 + */ + managerDeptName?: string; + } export interface ErpProjectPlanForm extends BaseEntity { @@ -97,6 +112,11 @@ export interface ErpProjectPlanForm extends BaseEntity { */ projectId?: string | number; + /** + * 项目计划编号 + */ + projectPlanCode?: string; + /** * 项目经理 */ @@ -132,11 +152,31 @@ export interface ErpProjectPlanForm extends BaseEntity { */ contractId?: string | number; + /** + * 附件ID + */ + ossId?: string; + /** * 备注 */ remark?: string; + /** + * 项目经理部门名称(展示用) + */ + managerDeptName?: string; + + /** + * 项目经理名称(展示用) + */ + managerName?: string; + + /** + * 部门负责人名称(展示用) + */ + chargeName?: string; + /** * 激活标识(1是 0否) */ @@ -176,6 +216,11 @@ export interface ErpProjectPlanQuery extends PageQuery { */ projectId?: string | number; + /** + * 项目计划编号 + */ + projectPlanCode?: string; + /** * 项目经理 */ diff --git a/src/views/oa/crm/crmQuoteInfo/index.vue b/src/views/oa/crm/crmQuoteInfo/index.vue index 6110637..ad3eed5 100644 --- a/src/views/oa/crm/crmQuoteInfo/index.vue +++ b/src/views/oa/crm/crmQuoteInfo/index.vue @@ -487,7 +487,7 @@ const dialog = reactive({ // 列显隐信息 const columns = ref([ - { key: 1, label: `序号`, visible: true }, + { key: 0, label: `序号`, visible: true }, { key: 1, label: `报价单号`, visible: true }, { key: 2, label: `报价单名称`, visible: true }, { key: 3, label: `报价轮次`, visible: false }, @@ -525,11 +525,7 @@ const columns = ref([ { key: 35, 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 = {