style:生产计划-详情侧边栏字段调整

main
黄伟杰 7 hours ago
parent f05c908a7d
commit 3b7496f19d

@ -4888,6 +4888,21 @@ export default {
baogongSuccessMessage: 'Report succeeded!',
detailDialogTitle: 'Detail',
detailBaseTabLabel: 'Basic Info',
detailOperationRecordTabLabel: 'Operation Records',
lineChangeRecordEmptyText: 'No line change records',
lineChangeItemEmptyText: 'No line change details',
lineChangeItemIdColumn: 'ID',
lineChangeItemRouteItemIdColumn: 'Route Item ID',
lineChangeItemProcessParameterNameColumn: 'Process Parameter Name',
lineChangeItemBeforeDeviceColumn: 'Device Before Change',
lineChangeItemAfterDeviceColumn: 'Device After Change',
lineChangeBatchNoColumn: 'Line Change Batch No.',
lineChangeTimeColumn: 'Line Change Time',
lineChangeCountColumn: 'Changed Process Count',
lineChangeOperatorUserIdColumn: 'Operator ID',
lineChangePassNumberColumn: 'Finished Qty Before Change',
lineChangeRemarkColumn: 'Remark',
detailDialogTaskLabel: 'Task Order',
detailDialogTaskPlaceholder: 'Please enter task order',
detailDialogProductLabel: 'Detail Item',
@ -5536,6 +5551,8 @@ export default {
treeSearchPlaceholder: 'Search device or parameter',
refreshButtonText: 'Refresh',
formTimeLabel: 'Time',
formTimeStartPlaceholder: 'Start Date',
formTimeEndPlaceholder: 'End Date',

@ -4736,6 +4736,21 @@ export default {
baogongSuccessMessage: '报工成功!',
detailDialogTitle: '详情',
detailBaseTabLabel: '\u57fa\u7840\u4fe1\u606f',
detailOperationRecordTabLabel: '\u64cd\u4f5c\u8bb0\u5f55',
lineChangeRecordEmptyText: '\u6682\u65e0\u6362\u7ebf\u8bb0\u5f55',
lineChangeItemEmptyText: '\u6682\u65e0\u6362\u7ebf\u660e\u7ec6',
lineChangeItemIdColumn: '\u7f16\u53f7',
lineChangeItemRouteItemIdColumn: '\u6d41\u7a0b\u660e\u7ec6ID',
lineChangeItemProcessParameterNameColumn: '\u5de5\u827a\u53c2\u6570\u540d\u79f0',
lineChangeItemBeforeDeviceColumn: '\u6362\u7ebf\u524d\u8bbe\u5907',
lineChangeItemAfterDeviceColumn: '\u6362\u7ebf\u540e\u8bbe\u5907',
lineChangeBatchNoColumn: '\u6362\u7ebf\u6279\u6b21\u53f7',
lineChangeTimeColumn: '\u6362\u7ebf\u65f6\u95f4',
lineChangeCountColumn: '\u53d8\u66f4\u5de5\u5e8f\u6570\u91cf',
lineChangeOperatorUserIdColumn: '\u64cd\u4f5c\u4ebaID',
lineChangePassNumberColumn: '\u6362\u7ebf\u524d\u5b8c\u5de5\u6570\u91cf',
lineChangeRemarkColumn: '\u5907\u6ce8',
detailDialogTaskLabel: '任务单',
detailDialogTaskPlaceholder: '请输入任务单',
detailDialogProductLabel: '明细项',
@ -5382,6 +5397,8 @@ export default {
treeSearchPlaceholder: '搜索设备或参数',
refreshButtonText: '刷新',
formTimeLabel: '时间',
formTimeStartPlaceholder: '开始日期',
formTimeEndPlaceholder: '结束日期',
@ -5756,6 +5773,8 @@ export default {
treeSearchPlaceholder: '搜索设备或参数',
refreshButtonText: '刷新',
formTimeLabel: '时间',
formTimeStartPlaceholder: '开始日期',
formTimeEndPlaceholder: '结束日期',

@ -8,7 +8,7 @@
class="plan-detail-drawer"
>
<el-tabs v-model="activeTab" class="plan-detail-tabs">
<el-tab-pane label="基础信息" name="base">
<el-tab-pane :label="t('ProductionPlan.Plan.detailBaseTabLabel')" name="base">
<el-form
ref="formRef"
:model="formData"
@ -132,7 +132,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="报工记录" name="baogong" lazy>
<el-tab-pane :label="t('ProductionPlan.Plan.detailBaogongRecordTabLabel')" name="baogong" lazy>
<BaogongRecordList
v-if="currentPlanId"
:key="`${currentPlanId}-${recordRefreshKey}`"
@ -140,7 +140,7 @@
/>
</el-tab-pane>
<el-tab-pane label="操作记录" name="operation" lazy>
<el-tab-pane :label="t('ProductionPlan.Plan.detailOperationRecordTabLabel')" name="operation" lazy>
<el-table
v-loading="lineChangeRecordLoading"
:data="lineChangeRecordList"
@ -148,7 +148,7 @@
:stripe="true"
:show-overflow-tooltip="true"
:row-key="getLineChangeBatchRowKey"
empty-text="暂无换线记录"
:empty-text="t('ProductionPlan.Plan.lineChangeRecordEmptyText')"
>
<el-table-column type="expand" width="48">
<template #default="scope">
@ -158,23 +158,20 @@
size="small"
class="line-change-items-table"
row-key="id"
empty-text="暂无换线明细"
:empty-text="t('ProductionPlan.Plan.lineChangeItemEmptyText')"
>
<el-table-column label="编号" prop="id" width="80" align="center" />
<el-table-column label="流程明细ID" prop="planProcessRouteItemId" width="110" align="center" />
<el-table-column label="工艺参数名称" prop="processParameterName" min-width="150" align="center" />
<el-table-column label="换线前设备" prop="beforeDeviceName" min-width="150" align="center" />
<el-table-column label="换线后设备" prop="afterDeviceName" min-width="150" align="center" />
<el-table-column label="备注" prop="remark" min-width="160" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeItemProcessParameterNameColumn')" prop="processParameterName" min-width="150" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeItemBeforeDeviceColumn')" prop="beforeDeviceName" min-width="150" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeItemAfterDeviceColumn')" prop="afterDeviceName" min-width="150" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeRemarkColumn')" prop="remark" min-width="160" align="center" />
</el-table>
</template>
</el-table-column>
<el-table-column label="换线批次号" prop="changeBatchNo" min-width="170" align="center" />
<el-table-column label="换线时间" prop="changeTime" :formatter="dateFormatter2" width="170" align="center" />
<el-table-column label="变更工序数量" prop="changeCount" width="120" align="center" />
<el-table-column label="操作人ID" prop="operatorUserId" width="100" align="center" />
<el-table-column label="当前合格数量" prop="passNumber" width="120" align="center" />
<el-table-column label="备注" prop="remark" min-width="160" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeBatchNoColumn')" prop="changeBatchNo" min-width="170" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeTimeColumn')" prop="changeTime" :formatter="dateFormatter2" width="170" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeCountColumn')" prop="changeCount" width="120" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangePassNumberColumn')" prop="passNumber" width="140" align="center" />
<el-table-column :label="t('ProductionPlan.Plan.lineChangeRemarkColumn')" prop="remark" min-width="160" align="center" />
</el-table>
<Pagination
:total="lineChangeRecordTotal"

@ -122,7 +122,7 @@
<el-button link type="info" @click="openDetail(scope.row.id)" v-hasPermi="['mes:plan:query']">
{{ t('ProductionPlan.Plan.actionDetailLabel') }}
</el-button>
<el-button link type="primary" @click="openChangeLineDialog(scope.row)" v-hasPermi="['mes:plan:update']">
<el-button link type="primary" @click="openChangeLineDialog(scope.row)" v-hasPermi="['mes:plan:update']" v-if="String(scope.row.status) !== '9'">
换线
</el-button>
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:plan:update']"
@ -534,6 +534,10 @@ const hasLineChangeChanges = computed(() => changedLineChangeItems.value.length
const openChangeLineDialog = async (row: PlanVO) => {
if (!row?.id) return
if (String(row.status) === '9') {
message.warning('完工状态不能换线')
return
}
lineChangePlanId.value = row.id
lineChangeDialogTitle.value = row.code ? `换线 - ${row.code}` : '换线'
lineChangeDialogVisible.value = true

Loading…
Cancel
Save