From f21e0e77a5d4f080f50d3b2bc4b9a806556612ad Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 15 Dec 2025 18:33:54 +0800 Subject: [PATCH] =?UTF-8?q?1.0.46=20=E5=90=88=E5=90=8C=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E3=80=81=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oa/base/materialInfo/index.ts | 14 ++ src/api/oa/base/relationMaterial/types.ts | 20 +++ src/api/oa/erp/contractInfo/types.ts | 50 +++++++ src/api/oa/erp/contractMaterial/types.ts | 5 + src/components/SaleMaterialSelect/index.vue | 21 +-- src/views/oa/base/relationMaterial/index.vue | 27 ++-- src/views/oa/erp/contractInfo/edit.vue | 143 ++++++++++++++----- src/views/oa/erp/contractInfo/index.vue | 27 +++- 8 files changed, 243 insertions(+), 64 deletions(-) diff --git a/src/api/oa/base/materialInfo/index.ts b/src/api/oa/base/materialInfo/index.ts index 9603057..b5ed6eb 100644 --- a/src/api/oa/base/materialInfo/index.ts +++ b/src/api/oa/base/materialInfo/index.ts @@ -1,6 +1,7 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { MaterialInfoVO, MaterialInfoForm, MaterialInfoQuery } from '@/api/oa/base/materialInfo/types'; +import { RelationMaterialVO } from '@/api/oa/base/relationMaterial/types'; /** * 查询SAP物料信息列表 @@ -74,3 +75,16 @@ export function getBaseMaterialInfoList (query) { params: query }); }; + +/** + * 查询物料信息并关联销售物料表 + * @param query + * @returns {*} + */ +export const listMaterialInfoWithRelation = (query?: MaterialInfoQuery): AxiosPromise => { + return request({ + url: '/oa/base/materialInfo/listWithRelation', + method: 'get', + params: query + }); +}; diff --git a/src/api/oa/base/relationMaterial/types.ts b/src/api/oa/base/relationMaterial/types.ts index 9fca428..1529f6c 100644 --- a/src/api/oa/base/relationMaterial/types.ts +++ b/src/api/oa/base/relationMaterial/types.ts @@ -19,6 +19,11 @@ export interface RelationMaterialVO { */ saleMaterialName: string; + /** + * 销售物料型号 + */ + saleMaterialModel?: string; + /** * SAP物料编码 */ @@ -29,6 +34,11 @@ export interface RelationMaterialVO { */ materialName?: string; + /** + * 物料型号 + */ + materialModel?: string; + /** * 客户名称 */ @@ -92,6 +102,11 @@ export interface RelationMaterialForm extends BaseEntity { */ saleMaterialName?: string; + /** + * 销售物料型号 + */ + saleMaterialModel?: string; + /** * 备注 */ @@ -126,6 +141,11 @@ export interface RelationMaterialQuery extends PageQuery { */ saleMaterialName?: string; + /** + * 销售物料型号 + */ + saleMaterialModel?: string; + /** * 激活标识（1是 0否） */ diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts index c5edbdc..0cf3d50 100644 --- a/src/api/oa/erp/contractInfo/types.ts +++ b/src/api/oa/erp/contractInfo/types.ts @@ -154,6 +154,26 @@ export interface ContractInfoVO { */ activeFlag: string; + /** + * 合同负责人 + */ + contractManagerId: string | number; + + /** + * 合同负责人名称 + */ + contractManagerName: string; + + /** + * 合同大写金额 + */ + capitalizedAmount: string; + + /** + * 合同模板标识（1客户 2内部） + */ + contractTemplateFlag: string; + } export interface ContractInfoForm extends BaseEntity { @@ -312,6 +332,21 @@ export interface ContractInfoForm extends BaseEntity { */ activeFlag?: string; + /** + * 合同负责人 + */ + contractManagerId?: string | number; + + /** + * 合同大写金额 + */ + capitalizedAmount?: string; + + /** + * 合同模板标识（1客户 2内部） + */ + contractTemplateFlag?: string; + /** * 合同物料列表 */ @@ -468,6 +503,21 @@ export interface ContractInfoQuery extends PageQuery { */ activeFlag?: string; + /** + * 合同负责人 + */ + contractManagerId?: string | number; + + /** + * 合同大写金额 + */ + capitalizedAmount?: string; + + /** + * 合同模板标识（1客户 2内部） + */ + contractTemplateFlag?: string; + /** * 日期范围参数 */ diff --git a/src/api/oa/erp/contractMaterial/types.ts b/src/api/oa/erp/contractMaterial/types.ts index 509f8d0..99434b1 100644 --- a/src/api/oa/erp/contractMaterial/types.ts +++ b/src/api/oa/erp/contractMaterial/types.ts @@ -182,6 +182,11 @@ export interface ContractMaterialForm extends BaseEntity { */ activeFlag?: string; + /** + * 销售物料名称 + */ + saleMaterialName?: string; + } export interface ContractMaterialQuery extends PageQuery { diff --git a/src/components/SaleMaterialSelect/index.vue b/src/components/SaleMaterialSelect/index.vue index b9b4040..768b3ec 100644 --- a/src/components/SaleMaterialSelect/index.vue +++ b/src/components/SaleMaterialSelect/index.vue @@ -13,11 +13,11 @@ + + + - - - 搜索 @@ -56,9 +56,11 @@ - - + + + + @@ -89,10 +91,11 @@