feat:任务制单-添加是否急单字段

pull/1/head
黄伟杰 4 weeks ago
parent 4863831a0c
commit 24e2a156a4

@ -6,6 +6,7 @@ export interface TaskVO {
code: string // 编码 code: string // 编码
orderDate: Date // 下达日期 orderDate: Date // 下达日期
deliveryDate: Date // 交货日期 deliveryDate: Date // 交货日期
isUrgent: string // 是否急单0-否 1-是
status: number // 状态 status: number // 状态
processInstanceId: string // 流程实例的编号 processInstanceId: string // 流程实例的编号
remark: string // 备注 remark: string // 备注

@ -3215,6 +3215,7 @@ export default {
tableOrderDateColumn: 'Order Date', tableOrderDateColumn: 'Order Date',
tableDeliveryDateColumn: 'Delivery Date', tableDeliveryDateColumn: 'Delivery Date',
tableTaskTypeColumn: 'Type', tableTaskTypeColumn: 'Type',
tableIsUrgentColumn: 'Urgent',
tableStatusColumn: 'Status', tableStatusColumn: 'Status',
tableRemarkColumn: 'Remark', tableRemarkColumn: 'Remark',
tableOperateColumn: 'Operate', tableOperateColumn: 'Operate',
@ -3234,6 +3235,9 @@ export default {
dialogDeliveryDatePlaceholder: 'Select delivery date', dialogDeliveryDatePlaceholder: 'Select delivery date',
dialogTaskTypeLabel: 'Task Type', dialogTaskTypeLabel: 'Task Type',
dialogTaskTypeTooltip: 'Source: Data Dictionary - Task Type', dialogTaskTypeTooltip: 'Source: Data Dictionary - Task Type',
dialogIsUrgentLabel: 'Urgent',
urgentNoLabel: 'No',
urgentYesLabel: 'Yes',
dialogRemarkLabel: 'Remark', dialogRemarkLabel: 'Remark',
dialogRemarkPlaceholder: 'Please enter remark', dialogRemarkPlaceholder: 'Please enter remark',
dialogSubmitButtonText: 'Confirm', dialogSubmitButtonText: 'Confirm',
@ -3241,6 +3245,7 @@ export default {
validatorDeliveryDateRequired: 'Delivery date cannot be empty', validatorDeliveryDateRequired: 'Delivery date cannot be empty',
validatorTaskTypeRequired: 'Task type cannot be empty', validatorTaskTypeRequired: 'Task type cannot be empty',
validatorIsUrgentRequired: 'Urgent flag cannot be empty',
saleDialogCodeLabel: 'Code', saleDialogCodeLabel: 'Code',
saleDialogCodePlaceholder: 'Please enter task code', saleDialogCodePlaceholder: 'Please enter task code',

@ -3055,6 +3055,7 @@ export default {
tableOrderDateColumn: '下达日期', tableOrderDateColumn: '下达日期',
tableDeliveryDateColumn: '交货日期', tableDeliveryDateColumn: '交货日期',
tableTaskTypeColumn: '类型', tableTaskTypeColumn: '类型',
tableIsUrgentColumn: '是否急单',
tableStatusColumn: '状态', tableStatusColumn: '状态',
tableRemarkColumn: '备注', tableRemarkColumn: '备注',
tableOperateColumn: '操作', tableOperateColumn: '操作',
@ -3074,6 +3075,9 @@ export default {
dialogDeliveryDatePlaceholder: '选择交货日期', dialogDeliveryDatePlaceholder: '选择交货日期',
dialogTaskTypeLabel: '任务类型', dialogTaskTypeLabel: '任务类型',
dialogTaskTypeTooltip: '来源:数据字典-任务单类型', dialogTaskTypeTooltip: '来源:数据字典-任务单类型',
dialogIsUrgentLabel: '是否急单',
urgentNoLabel: '否',
urgentYesLabel: '是',
dialogRemarkLabel: '备注', dialogRemarkLabel: '备注',
dialogRemarkPlaceholder: '请输入备注', dialogRemarkPlaceholder: '请输入备注',
dialogSubmitButtonText: '确 定', dialogSubmitButtonText: '确 定',
@ -3081,6 +3085,7 @@ export default {
validatorDeliveryDateRequired: '交货日期不能为空', validatorDeliveryDateRequired: '交货日期不能为空',
validatorTaskTypeRequired: '任务类型不能为空', validatorTaskTypeRequired: '任务类型不能为空',
validatorIsUrgentRequired: '是否急单不能为空',
saleDialogCodeLabel: '编码', saleDialogCodeLabel: '编码',
saleDialogCodePlaceholder: '请输入任务单编码', saleDialogCodePlaceholder: '请输入任务单编码',

@ -62,6 +62,12 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="t('ProductionPlan.Task.dialogIsUrgentLabel')" prop="isUrgent">
<el-radio-group v-model="formData.isUrgent">
<el-radio label="0">{{ t('ProductionPlan.Task.urgentNoLabel') }}</el-radio>
<el-radio label="1">{{ t('ProductionPlan.Task.urgentYesLabel') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="t('ProductionPlan.Task.dialogRemarkLabel')" prop="remark"> <el-form-item :label="t('ProductionPlan.Task.dialogRemarkLabel')" prop="remark">
<el-input v-model="formData.remark" :placeholder="t('ProductionPlan.Task.dialogRemarkPlaceholder')" type="textarea"/> <el-input v-model="formData.remark" :placeholder="t('ProductionPlan.Task.dialogRemarkPlaceholder')" type="textarea"/>
@ -95,6 +101,7 @@ const formData = ref({
deliveryDate: undefined, deliveryDate: undefined,
status: undefined, status: undefined,
taskType: undefined, taskType: undefined,
isUrgent: undefined,
processInstanceId: undefined, processInstanceId: undefined,
remark: undefined, remark: undefined,
isEnable: undefined, isEnable: undefined,
@ -103,6 +110,7 @@ const formData = ref({
const formRules = reactive({ const formRules = reactive({
deliveryDate: [{ required: true, message: t('ProductionPlan.Task.validatorDeliveryDateRequired'), trigger: 'blur' }], deliveryDate: [{ required: true, message: t('ProductionPlan.Task.validatorDeliveryDateRequired'), trigger: 'blur' }],
taskType: [{ required: true, message: t('ProductionPlan.Task.validatorTaskTypeRequired'), trigger: 'blur' }], taskType: [{ required: true, message: t('ProductionPlan.Task.validatorTaskTypeRequired'), trigger: 'blur' }],
isUrgent: [{ required: true, message: t('ProductionPlan.Task.validatorIsUrgentRequired'), trigger: 'change' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
@ -116,7 +124,11 @@ const open = async (type: string, id?: number) => {
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await TaskApi.getTask(id) const taskData = await TaskApi.getTask(id)
formData.value = {
...taskData,
isUrgent: String(taskData?.isUrgent ?? '0')
}
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -155,6 +167,7 @@ const resetForm = () => {
code: undefined, code: undefined,
orderDate: undefined, orderDate: undefined,
taskType: '订单任务', taskType: '订单任务',
isUrgent: '0',
deliveryDate: undefined, deliveryDate: undefined,
status: undefined, status: undefined,
processInstanceId: undefined, processInstanceId: undefined,

@ -115,6 +115,13 @@
<dict-tag :type="DICT_TYPE.MES_TASK_TYPE" :value="scope.row.taskType" /> <dict-tag :type="DICT_TYPE.MES_TASK_TYPE" :value="scope.row.taskType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('ProductionPlan.Task.tableIsUrgentColumn')" align="center" prop="isUrgent" sortable>
<template #default="scope">
<el-tag :type="String(scope.row.isUrgent) === '1' ? 'danger' : 'info'">
{{ String(scope.row.isUrgent) === '1' ? t('ProductionPlan.Task.urgentYesLabel') : t('ProductionPlan.Task.urgentNoLabel') }}
</el-tag>
</template>
</el-table-column>
<el-table-column :label="t('ProductionPlan.Task.tableStatusColumn')" align="center" prop="status" sortable> <el-table-column :label="t('ProductionPlan.Task.tableStatusColumn')" align="center" prop="status" sortable>
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="scope.row.status" />

Loading…
Cancel
Save