From f7a6b21f67d6b9fe9a8d675399ad861fc638ff12 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 07 5月 2025 16:10:36 +0800 Subject: [PATCH] 出入库记录 --- HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 301 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 198 insertions(+), 103 deletions(-) diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx index 386618d..ad5c006 100644 --- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx +++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx @@ -41,6 +41,25 @@ ></el-input-number> ) } + const datePicker = (attrs) => { + return ( + <el-date-picker + type="datetime" + format="YYYY-MM-DD" + {...attrs} + ></el-date-picker> + ) + } + + const dateTimePicker = (attrs) => { + return ( + <el-date-picker + type="datetime" + format="YYYY-MM-DD HH:mm:ss" + {...attrs} + ></el-date-picker> + ) + } const visible = computed({ get() { @@ -55,45 +74,174 @@ */ const formItems = reactive([ { - label: '宸烽亾', - prop: 'aisle', + label: '浠诲姟鍙�', + prop: 'taskNo', + el: 'input', //disabled: disabled, - placeholder: '璇疯緭鍏ュ贩閬�', + placeholder: '璇疯緭鍏ヤ换鍔″彿', + rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }], + }, + { + label: '浠诲姟绫诲瀷', + prop: 'taskType', + el: 'select', + //disabled: disabled, + placeholder: '璇疯緭鍏ヤ换鍔$被鍨�', + rules: [{ required: true, message: '浠诲姟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }], + }, + { + label: '瀛愪换鍔$被鍨�', + prop: 'sonTaskType', + el: 'select', + //disabled: disabled, + rules: [ + { required: true, message: '瀛愪换鍔$被鍨嬩笉鑳戒负绌�', trigger: 'blur' }, + ], + placeholder: '璇疯緭鍏ュ瓙浠诲姟绫诲瀷', + }, + { + label: '浠诲姟绛夌骇', + prop: 'taskLevel', + el: (props: any, { attrs }: SetupContext) => { + return h(inputNumber, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', + step: 1, + precision: 0, + //disabled: disabled, + placeholder: '璇疯緭鍏ヤ换鍔$瓑绾�', + rules: [{ required: true, message: '浠诲姟绛夌骇涓嶈兘涓虹┖', trigger: 'blur' }], + }, + { + label: '浠诲姟鐘舵��', + prop: 'taskStatus', + el: 'select', + options: [], + //disabled: disabled, + placeholder: '璇疯緭鍏ヤ换鍔$姸鎬�', + rules: [{ required: true, message: '浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }], }, { label: '鎵樼洏缂栧彿', prop: 'containerNo', el: 'input', + rules: [{ required: true, message: '鎵樼洏缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }], //disabled: disabled, placeholder: '璇疯緭鍏ユ墭鐩樼紪鍙�', }, { + label: '璧峰搴撲綅', + prop: 'sourcePlace', + el: 'input', + //disabled: disabled, + rules: [{ required: true, message: '璧峰搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }], + placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�', + }, + { + label: '鐩爣搴撲綅', + prop: 'toPlace', + el: 'input', + //disabled: disabled, + rules: [{ required: true, message: '鐩爣搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }], + placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�', + }, + { + label: '宸烽亾', + prop: 'aisle', + el: (props: any, { attrs }: SetupContext) => { + return h(inputNumber, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', + step: 1, + precision: 0, + rules: [{ required: true, message: '宸烽亾涓嶈兘涓虹┖', trigger: 'blur' }], + //disabled: disabled, + placeholder: '璇疯緭鍏ュ贩閬�', + }, + { label: '鍫嗗灈鏈篒D', prop: 'dodeviceId', + el: (props: any, { attrs }: SetupContext) => { + return h(inputNumber, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', + step: 1, + precision: 0, + rules: [{ required: true, message: '鍫嗗灈鏈篒D涓嶈兘涓虹┖', trigger: 'blur' }], //disabled: disabled, placeholder: '璇疯緭鍏ュ爢鍨涙満ID', }, { label: '璁惧绫诲瀷', prop: 'dodevicetype', + el: 'select', + options: [], + width: '100%', //disabled: disabled, placeholder: '璇疯緭鍏ヨ澶囩被鍨�', rules: [{ required: true, message: '璁惧绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }], }, { - label: '涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛', + label: '璁惧浠诲姟鐘舵��', + prop: 'taskDodeviceStatus', + el: 'select', + options: [], + width: '100%', + //disabled: disabled, + placeholder: '璇疯緭鍏ヨ澶囦换鍔$姸鎬�', + rules: [ + { required: true, message: '璁惧浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }, + ], + }, + { + label: 'WCS鏄惁鍙互璇诲彇', + prop: 'isRead', + el: 'select', + //disabled: disabled, + placeholder: '璇疯緭鍏CS鏄惁鍙互璇诲彇', + rules: [ + { required: true, message: 'WCS鏄惁鍙互璇诲彇涓嶈兘涓虹┖', trigger: 'blur' }, + ], + options: [ + { label: '鏄�', value: true }, + { label: '鍚�', value: false }, + ], + }, + { + label: '鏉ユ簮鍗曟嵁鍙�', + prop: 'sourceOrderNo', + el: 'input', + //disabled: disabled, + placeholder: '璇疯緭鍏ユ潵婧愬崟鎹彿', + }, + { + label: '涓嬩釜浠诲姟鏄惁鐢熸垚', prop: 'isNextTask', + el: (props: any, { attrs }: SetupContext) => { + return h(inputNumber, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', + step: 1, + precision: 0, //disabled: disabled, placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�', }, - // { - // label: 'WCS鏄惁鍙互璇诲彇', - // prop: 'isRead', - // el: 'select', - // //disabled: disabled, - // placeholder: '璇疯緭鍏CS鏄惁鍙互璇诲彇', - // rules: [{required: true, message: 'WCS鏄惁鍙互璇诲彇涓嶈兘涓虹┖', trigger: 'blur' }], - // }, { label: '鍙彉鍙橀噺1', prop: 'mutableParam1', @@ -114,74 +262,6 @@ el: 'input', //disabled: disabled, placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3', - }, - { - label: '瀛愪换鍔$被鍨�', - prop: 'sonTaskType', - el: 'select', - //disabled: disabled, - placeholder: '璇疯緭鍏ュ瓙浠诲姟绫诲瀷', - }, - { - label: '鏉ユ簮鍗曟嵁鍙�', - prop: 'sourceOrderNo', - el: 'input', - //disabled: disabled, - placeholder: '璇疯緭鍏ユ潵婧愬崟鎹彿', - }, - { - label: '璧峰搴撲綅', - prop: 'sourcePlace', - el: 'input', - //disabled: disabled, - placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�', - }, - { - label: '璁惧浠诲姟鐘舵��', - prop: 'taskDodeviceStatus', - //disabled: disabled, - placeholder: '璇疯緭鍏ヨ澶囦换鍔$姸鎬�', - rules: [ - { required: true, message: '璁惧浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }, - ], - }, - { - label: '浠诲姟绛夌骇', - prop: 'taskLevel', - //disabled: disabled, - placeholder: '璇疯緭鍏ヤ换鍔$瓑绾�', - rules: [{ required: true, message: '浠诲姟绛夌骇涓嶈兘涓虹┖', trigger: 'blur' }], - }, - { - label: '浠诲姟鍙�', - prop: 'taskNo', - el: 'input', - //disabled: disabled, - placeholder: '璇疯緭鍏ヤ换鍔″彿', - rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }], - }, - { - label: '浠诲姟鐘舵��', - prop: 'taskStatus', - el: 'select', - //disabled: disabled, - placeholder: '璇疯緭鍏ヤ换鍔$姸鎬�', - rules: [{ required: true, message: '浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }], - }, - { - label: '浠诲姟绫诲瀷', - prop: 'taskType', - el: 'select', - //disabled: disabled, - placeholder: '璇疯緭鍏ヤ换鍔$被鍨�', - rules: [{ required: true, message: '浠诲姟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }], - }, - { - label: '鐩爣搴撲綅', - prop: 'toPlace', - el: 'input', - //disabled: disabled, - placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�', }, ]) /** @@ -218,24 +298,24 @@ const onConfirm = async () => { await formRef.value?.validate() const data = { - aisle: formData.value.aisle, + taskNo: formData.value.taskNo, + taskType: formData.value.taskType, + taskLevel: formData.value.taskLevel, + taskStatus: formData.value.taskStatus, containerNo: formData.value.containerNo, + sourcePlace: formData.value.sourcePlace, + toPlace: formData.value.toPlace, + aisle: formData.value.aisle, dodeviceId: formData.value.dodeviceId, dodevicetype: formData.value.dodevicetype, - isNextTask: formData.value.isNextTask, + taskDodeviceStatus: formData.value.taskDodeviceStatus, isRead: formData.value.isRead, + sonTaskType: formData.value.sonTaskType, + sourceOrderNo: formData.value.sourceOrderNo, + isNextTask: formData.value.isNextTask, mutableParam1: formData.value.mutableParam1, mutableParam2: formData.value.mutableParam2, mutableParam3: formData.value.mutableParam3, - sonTaskType: formData.value.sonTaskType, - sourceOrderNo: formData.value.sourceOrderNo, - sourcePlace: formData.value.sourcePlace, - taskDodeviceStatus: formData.value.taskDodeviceStatus, - taskLevel: formData.value.taskLevel, - taskNo: formData.value.taskNo, - taskStatus: formData.value.taskStatus, - taskType: formData.value.taskType, - toPlace: formData.value.toPlace, } if (!current.value) { await wmsTaskDrawer.addWmsTask(data) @@ -279,6 +359,16 @@ EnumName: 'SonTaskTypeEnum', }) updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum) + + const dodevicetypeEnum = await wmsTaskDrawer.getWmsEnumData({ + EnumName: 'DodevicetypeEnum', + }) + updateFormItemOptions('dodevicetype', dodevicetypeEnum) + + const taskDodeviceStatus = await wmsTaskDrawer.getWmsEnumData({ + EnumName: 'TaskDodeviceStatus', + }) + updateFormItemOptions('taskDodeviceStatus', taskDodeviceStatus) } commonQueryEnumForFrom() /** @@ -289,30 +379,35 @@ const res = await wmsTaskDrawer.getWmsTaskDetail(current.value) formData.value = { - aisle: res.aisle, + taskNo: res.taskNo, + taskType: res.taskType, + taskLevel: res.taskLevel, + taskStatus: res.taskStatus, containerNo: res.containerNo, + sourcePlace: res.sourcePlace, + toPlace: res.toPlace, + aisle: res.aisle, dodeviceId: res.dodeviceId, dodevicetype: res.dodevicetype, - isNextTask: res.isNextTask, + taskDodeviceStatus: res.taskDodeviceStatus, isRead: res.isRead, + sonTaskType: res.sonTaskType, + sourceOrderNo: res.sourceOrderNo, + isNextTask: res.isNextTask, mutableParam1: res.mutableParam1, mutableParam2: res.mutableParam2, mutableParam3: res.mutableParam3, - sonTaskType: res.sonTaskType, - sourceOrderNo: res.sourceOrderNo, - sourcePlace: res.sourcePlace, - taskDodeviceStatus: res.taskDodeviceStatus, - taskLevel: res.taskLevel, - taskNo: res.taskNo, - taskStatus: res.taskStatus, - taskType: res.taskType, - toPlace: res.toPlace, id: res.id, } disabled.value = true updateCheckData() } else { - formData.value = {} + formData.value = { + taskDodeviceStatus: 1, + isRead: true, + isNextTask: 1, + taskStatus: 1, + } disabled.value = false updateCheckData() -- Gitblit v1.9.3