diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 7f1ab8c4..42b44c57 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -7,6 +7,7 @@
label-width="110px"
v-loading="formLoading"
>
+
计划
+ 领料
+
+
+
+
+
+
+
+
{{ t('ProductionPlan.Plan.dialogSubmitButtonText') }}
@@ -169,11 +179,13 @@ import { PlanApi, PlanVO } from '@/api/mes/plan'
import { TaskApi, TaskDetailVO, TaskVO } from '@/api/mes/task'
import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
+import * as UserApi from '@/api/system/user'
/** 生产计划 表单 */
defineOptions({ name: 'PlanForm' })
const taskList = ref([]) // 用户列表
const taskDetailList = ref([]) // 用户列表
+const workerList = ref([])
const deviceSelectDialogRef = ref()
const selectedDeviceRows = ref([])
const maxUnplannedNumber = ref(undefined)
@@ -209,7 +221,8 @@ const formData = ref({
isCode: undefined,
latestStartTime: undefined,
finishDate: undefined,
- deliveryDate: undefined
+ deliveryDate: undefined,
+ isZj: true
})
const deliveryDateText = computed(() => {
const sourceValue = formData.value.finishDate || formData.value.deliveryDate
@@ -231,7 +244,7 @@ const deviceColumns = [
{ label: '设备编号', prop: 'deviceCode', minWidth: 140 },
{ label: '设备名称', prop: 'deviceName', minWidth: 160 },
{ label: '设备型号', prop: 'deviceModel', minWidth: 140 },
- { label: '所属车间', prop: 'workshop', minWidth: 140 }
+ { label: '所属车间', prop: 'workshopName', minWidth: 140 }
]
const latestStartDisabledDate = (date: Date) => {
if (!formData.value.finishDate) return false
@@ -434,6 +447,7 @@ const open = async (type: string, id?: number,
}
}
taskList.value = await TaskApi.getPlanTaskList()
+ workerList.value = await UserApi.getSimpleUserList()
}
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
@@ -486,7 +500,8 @@ const resetForm = () => {
isCode: true,
latestStartTime: undefined,
finishDate: undefined,
- deliveryDate: undefined
+ deliveryDate: undefined,
+ isZj: true
}
maxUnplannedNumber.value = undefined
selectedDeviceRows.value = []
@@ -513,4 +528,18 @@ const handlePlanEndTimeChange = () => {
}
+
+