diff --git a/src/api/mes/technologyInfo/types.ts b/src/api/mes/technologyInfo/types.ts index 43598d9..3acdf24 100644 --- a/src/api/mes/technologyInfo/types.ts +++ b/src/api/mes/technologyInfo/types.ts @@ -45,7 +45,8 @@ export interface TechnologyInfoVO { remark: string; prodTechnologyStepInfoList?: []; - + technologyName?: string; + materialName?: string; } export interface TechnologyInfoForm extends BaseEntity { @@ -78,6 +79,8 @@ export interface TechnologyInfoForm extends BaseEntity { * 工艺版本 */ technologyVersion?: string; + technologyName?: string; + materialName?: string; /** * 硫化标准时间(秒) @@ -147,6 +150,8 @@ export interface TechnologyInfoQuery extends PageQuery { params?: any; prodTechnologyStepInfoList?: []; + technologyName?: string; + materialName?: string; } diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue index b8257f8..3d1472d 100644 --- a/src/views/mes/prodInputScanInfo/index.vue +++ b/src/views/mes/prodInputScanInfo/index.vue @@ -1,187 +1,217 @@ - diff --git a/src/views/mes/technologyInfo/formingIndex.vue b/src/views/mes/technologyInfo/formingIndex.vue index 3f389db..8a5b799 100644 --- a/src/views/mes/technologyInfo/formingIndex.vue +++ b/src/views/mes/technologyInfo/formingIndex.vue @@ -55,6 +55,7 @@ + - + @@ -114,6 +115,9 @@ + + +