diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts index 26880cc2..aff38076 100644 --- a/src/api/mes/task/index.ts +++ b/src/api/mes/task/index.ts @@ -39,6 +39,9 @@ export interface TaskDetailVO { planNumber: number //已经计划的数量 packageSize: number // 打包要求(每包/个) projectName: string // 项目名称 + placementRule: string // 摆放规则 + packagingSchemeId: number // 包装方案 ID + packagingSchemeName: string // 包装方案名称 techRequirements: string // 技术要求 remark: string // 备注 isEnable: boolean // 是否启用 diff --git a/src/locales/en.ts b/src/locales/en.ts index f7d30a5f..71674546 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -4482,6 +4482,11 @@ export default { detailDialogPackageSizePlaceholder: 'Please enter packing requirement', detailDialogPackageNumberLabel: 'Package Quantity', detailDialogPackageNumberPlaceholder: 'Please enter quantity', + detailDialogPlacementRuleLabel: 'Placement Rule', + detailDialogPlacementRulePlaceholder: 'Please enter placement rule', + detailDialogPackagingSchemeLabel: 'Packaging Scheme', + detailDialogPackagingSchemeTitle: 'Select Packaging Scheme', + detailDialogPackagingSchemePlaceholder: 'Please select packaging scheme', detailDialogTechRequirementsLabel: 'Technical Requirement', detailDialogTechRequirementsPlaceholder: 'Please enter technical requirement', detailDialogFinishDateLabel: 'Factory Completion', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index e4ed5394..81d91713 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -4335,6 +4335,11 @@ export default { detailDialogPackageSizePlaceholder: '请输入打包要求', detailDialogPackageNumberLabel: '打包数量', detailDialogPackageNumberPlaceholder: '请输入数量', + detailDialogPlacementRuleLabel: '摆放规则', + detailDialogPlacementRulePlaceholder: '请输入摆放规则', + detailDialogPackagingSchemeLabel: '包装方案', + detailDialogPackagingSchemeTitle: '选择包装方案', + detailDialogPackagingSchemePlaceholder: '请选择包装方案', detailDialogTechRequirementsLabel: '技术要求', detailDialogTechRequirementsPlaceholder: '请输入技术要求', detailDialogFinishDateLabel: '工厂完成', diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue index c2d877a0..28394dfa 100644 --- a/src/views/mes/task/components/TaskDetailForm.vue +++ b/src/views/mes/task/components/TaskDetailForm.vue @@ -43,35 +43,27 @@ - - - - - - + - - + - - + - - - @@ -118,6 +90,85 @@ + + + + + + + + + + + {{ t('common.query') }} + + + {{ t('common.reset') }} + + + + + + + + + + + + + +
+ +
+ +
+ + diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue index d67220e2..b371faf4 100644 --- a/src/views/mes/task/index.vue +++ b/src/views/mes/task/index.vue @@ -148,9 +148,9 @@ {{ t('ProductionPlan.Task.actionApproveLabel') }} - + - - - - - - - + - + @@ -43,7 +38,7 @@ v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD t('FactoryModeling.FactoryStructure.expandText') }} - + {{ t('ProductionPlan.TaskSummary.buttonSearchText') }} @@ -72,17 +67,13 @@ v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD - - - - - + @@ -113,11 +100,10 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" hi