style:生产投料-添加实际/计划投料时间

main
黄伟杰 2 weeks ago
parent 10c8f0d1b0
commit e366b2915b

@ -3293,7 +3293,7 @@ export default {
tableWeightColumn: 'Quantity', tableWeightColumn: 'Quantity',
tableUserColumn: 'Recorder', tableUserColumn: 'Recorder',
tableRemarkColumn: 'Remark', tableRemarkColumn: 'Remark',
tableFeedingTimeColumn: 'Feeding Time', tableFeedingTimeColumn: 'Plan Feeding Time',
tableOperateColumn: 'Operate', tableOperateColumn: 'Operate',
actionDeleteLabel: 'Delete', actionDeleteLabel: 'Delete',
@ -3316,7 +3316,7 @@ export default {
dialogProductPlaceholder: 'Please select product', dialogProductPlaceholder: 'Please select product',
dialogWeightLabel: 'Weight(kg)', dialogWeightLabel: 'Weight(kg)',
dialogWeightPlaceholder: 'Please enter weight', dialogWeightPlaceholder: 'Please enter weight',
dialogFeedingTimeLabel: 'Feeding Time', dialogFeedingTimeLabel: 'Plan Feeding Time',
dialogFeedingTimePlaceholder: 'Select feeding time', dialogFeedingTimePlaceholder: 'Select feeding time',
dialogRemarkLabel: 'Remark', dialogRemarkLabel: 'Remark',
dialogRemarkPlaceholder: 'Please enter remark', dialogRemarkPlaceholder: 'Please enter remark',

@ -3106,6 +3106,7 @@ export default {
FeedingRecord: { FeedingRecord: {
moduleName: '生产投料', moduleName: '生产投料',
planCode: '生产计划', planCode: '生产计划',
actualFeedingTime: '实际投料时间',
searchCodeLabel: '单号', searchCodeLabel: '单号',
searchCodePlaceholder: '请输入单号', searchCodePlaceholder: '请输入单号',
searchPipelineLabel: '制浆线', searchPipelineLabel: '制浆线',
@ -3136,7 +3137,7 @@ export default {
tableWeightColumn: '数量', tableWeightColumn: '数量',
tableUserColumn: '记录人', tableUserColumn: '记录人',
tableRemarkColumn: '备注', tableRemarkColumn: '备注',
tableFeedingTimeColumn: '投料时间', tableFeedingTimeColumn: '计划投料时间',
tableOperateColumn: '操作', tableOperateColumn: '操作',
actionDeleteLabel: '删除', actionDeleteLabel: '删除',
@ -3159,7 +3160,7 @@ export default {
dialogProductPlaceholder: '请选择产品', dialogProductPlaceholder: '请选择产品',
dialogWeightLabel: '重量(kg)', dialogWeightLabel: '重量(kg)',
dialogWeightPlaceholder: '请输入重量', dialogWeightPlaceholder: '请输入重量',
dialogFeedingTimeLabel: '投料时间', dialogFeedingTimeLabel: '计划投料时间',
dialogFeedingTimePlaceholder: '选择投料时间', dialogFeedingTimePlaceholder: '选择投料时间',
dialogRemarkLabel: '备注', dialogRemarkLabel: '备注',
dialogRemarkPlaceholder: '请输入备注', dialogRemarkPlaceholder: '请输入备注',

@ -113,7 +113,8 @@
<el-form-item :label="t('ProductionPlan.FeedingRecord.dialogFeedingTimeLabel') + ':'" prop="feedingTime"> <el-form-item :label="t('ProductionPlan.FeedingRecord.dialogFeedingTimeLabel') + ':'" prop="feedingTime">
<el-date-picker <el-date-picker
v-model="formData.feedingTime" v-model="formData.feedingTime"
type="date" type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="x" value-format="x"
:placeholder="t('ProductionPlan.FeedingRecord.dialogFeedingTimePlaceholder')" :placeholder="t('ProductionPlan.FeedingRecord.dialogFeedingTimePlaceholder')"
class="!w-full" class="!w-full"

@ -117,6 +117,13 @@
<dict-tag :type="DICT_TYPE.MES_FEEDING_RECORD_STATUS" :value="scope.row.recordStatus" /> <dict-tag :type="DICT_TYPE.MES_FEEDING_RECORD_STATUS" :value="scope.row.recordStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
:label="t('ProductionPlan.FeedingRecord.actualFeedingTime')"
align="center"
prop="actualFeedingTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column <el-table-column
:label="t('ProductionPlan.FeedingRecord.tableFeedingTimeColumn')" :label="t('ProductionPlan.FeedingRecord.tableFeedingTimeColumn')"
align="center" align="center"

Loading…
Cancel
Save