From c2bac53ff77d91dfffb4bda9b0bcbf6556fda9a1 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 13:25:23 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 95 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index ad5c006..6160398 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
@@ -77,7 +77,7 @@
label: '浠诲姟鍙�',
prop: 'taskNo',
el: 'input',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔″彿',
rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
},
@@ -85,7 +85,7 @@
label: '浠诲姟绫诲瀷',
prop: 'taskType',
el: 'select',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄被鍨�',
rules: [{ required: true, message: '浠诲姟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
},
@@ -93,7 +93,7 @@
label: '瀛愪换鍔＄被鍨�',
prop: 'sonTaskType',
el: 'select',
- //disabled: disabled,
+ disabled: disabled,
rules: [
{ required: true, message: '瀛愪换鍔＄被鍨嬩笉鑳戒负绌�', trigger: 'blur' },
],
@@ -121,7 +121,7 @@
prop: 'taskStatus',
el: 'select',
options: [],
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄姸鎬�',
rules: [{ required: true, message: '浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }],
},
@@ -130,14 +130,14 @@
prop: 'containerNo',
el: 'input',
rules: [{ required: true, message: '鎵樼洏缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ユ墭鐩樼紪鍙�',
},
{
label: '璧峰搴撲綅',
prop: 'sourcePlace',
el: 'input',
- //disabled: disabled,
+ disabled: disabled,
rules: [{ required: true, message: '璧峰搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }],
placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
},
@@ -145,7 +145,7 @@
label: '鐩爣搴撲綅',
prop: 'toPlace',
el: 'input',
- //disabled: disabled,
+ disabled: disabled,
rules: [{ required: true, message: '鐩爣搴撲綅涓嶈兘涓虹┖', trigger: 'blur' }],
placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
},
@@ -163,7 +163,7 @@
step: 1,
precision: 0,
rules: [{ required: true, message: '宸烽亾涓嶈兘涓虹┖', trigger: 'blur' }],
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ュ贩閬�',
},
{
@@ -180,7 +180,7 @@
step: 1,
precision: 0,
rules: [{ required: true, message: '鍫嗗灈鏈篒D涓嶈兘涓虹┖', trigger: 'blur' }],
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ュ爢鍨涙満ID',
},
{
@@ -189,7 +189,7 @@
el: 'select',
options: [],
width: '100%',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヨ澶囩被鍨�',
rules: [{ required: true, message: '璁惧绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
},
@@ -199,7 +199,7 @@
el: 'select',
options: [],
width: '100%',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヨ澶囦换鍔＄姸鎬�',
rules: [
{ required: true, message: '璁惧浠诲姟鐘舵�佷笉鑳戒负绌�', trigger: 'blur' },
@@ -209,7 +209,7 @@
label: 'WCS鏄惁鍙互璇诲彇',
prop: 'isRead',
el: 'select',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏CS鏄惁鍙互璇诲彇',
rules: [
{ required: true, message: 'WCS鏄惁鍙互璇诲彇涓嶈兘涓虹┖', trigger: 'blur' },
@@ -223,46 +223,51 @@
label: '鏉ユ簮鍗曟嵁鍙�',
prop: 'sourceOrderNo',
el: 'input',
- //disabled: disabled,
+ disabled: disabled,
placeholder: '璇疯緭鍏ユ潵婧愬崟鎹彿',
},
{
label: '涓嬩釜浠诲姟鏄惁鐢熸垚',
prop: 'isNextTask',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ el: 'select',
+ options: [
+ { label: '鏄�', value: 1 },
+ { label: '鍚�', value: 0 },
+ ],
width: '100%',
step: 1,
precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+ disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴�',
},
- {
- label: '鍙彉鍙橀噺1',
- prop: 'mutableParam1',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�1',
- },
- {
- label: '鍙彉鍙橀噺2',
- prop: 'mutableParam2',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�2',
- },
- {
- label: '鍙彉鍙橀噺3',
- prop: 'mutableParam3',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3',
- },
+ // {
+ // label: '鍙彉鍙橀噺1',
+ // prop: 'mutableParam1',
+ // el: 'input',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�1',
+ // },
+ // {
+ // label: '鍙彉鍙橀噺2',
+ // prop: 'mutableParam2',
+ // el: 'input',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�2',
+ // },
+ // {
+ // label: '鍙彉鍙橀噺3',
+ // prop: 'mutableParam3',
+ // el: 'input',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3',
+ // },
])
/**
* 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
@@ -399,7 +404,9 @@
mutableParam3: res.mutableParam3,
id: res.id,
}
- disabled.value = true
+ if (res.taskStatus != 1) {
+ disabled.value = true
+ }
updateCheckData()
} else {
formData.value = {
--
Gitblit v1.9.3