From cace264ad9d86a7831099810b079da1141957add Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 11:52:44 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 253 +++++++++++++++++++++++++++++++-------------------
1 files changed, 157 insertions(+), 96 deletions(-)
diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index 959fe29..46cecbe 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
@@ -55,10 +55,45 @@
*/
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: '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',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ换鍔＄姸鎬�',
+ rules: [{required: true, message: '浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }],
},
{
label: '鎵樼洏缂栧彿',
@@ -68,23 +103,84 @@
placeholder: '璇疯緭鍏ユ墭鐩樼紪鍙�',
},
{
+ label: '璧峰搴撲綅',
+ prop: 'sourcePlace',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
+ },
+ {
+ label: '鐩爣搴撲綅',
+ prop: 'toPlace',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
+ },
+ {
+ label: '宸烽亾',
+ prop: 'aisle',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //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,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ爢鍨涙満ID',
},
{
label: '璁惧绫诲瀷',
prop: 'dodevicetype',
+ 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: 'isNextTask',
+ label: '璁惧浠诲姟鐘舵��',
+ prop: 'taskDodeviceStatus',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
//disabled: disabled,
- placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+ placeholder: '璇疯緭鍏ヨ澶囦换鍔＄姸鎬�',
+ rules: [{required: true, message: '璁惧浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }],
},
{
label: 'WCS鏄惁鍙互璇诲彇',
@@ -93,6 +189,37 @@
//disabled: disabled,
placeholder: '璇疯緭鍏CS鏄惁鍙互璇诲彇',
rules: [{required: true, message: 'WCS鏄惁鍙互璇诲彇涓嶈兘涓虹┖', trigger: 'blur' }],
+ options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}]
+ },
+ {
+ label: '瀛愪换鍔＄被鍨�',
+ prop: 'sonTaskType',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ瓙浠诲姟绫诲瀷',
+ },
+ {
+ 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: '鍙彉鍙橀噺1',
@@ -114,72 +241,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: '璇疯緭鍏ョ洰鏍囧簱浣�',
},
])
/**
@@ -216,24 +277,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,
-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,
+isNextTask: formData.value.isNextTask,
+mutableParam1: formData.value.mutableParam1,
+mutableParam2: formData.value.mutableParam2,
+mutableParam3: formData.value.mutableParam3,
}
if (!current.value) {
await wmsTaskDrawer.addWmsTask(data)
@@ -288,24 +349,24 @@
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,
-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,
+isNextTask: res.isNextTask,
+mutableParam1: res.mutableParam1,
+mutableParam2: res.mutableParam2,
+mutableParam3: res.mutableParam3,
id: res.id,
}
disabled.value = true
--
Gitblit v1.9.3