From 90f258ea3c6708bdd1b79044c4e317df259eab97 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 14 5月 2025 11:09:22 +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 | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index 1ad174e..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: true,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔″彿',
rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
},
@@ -85,7 +85,7 @@
label: '浠诲姟绫诲瀷',
prop: 'taskType',
el: 'select',
- disabled: true,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄被鍨�',
rules: [{ required: true, message: '浠诲姟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
},
@@ -93,7 +93,7 @@
label: '瀛愪换鍔＄被鍨�',
prop: 'sonTaskType',
el: 'select',
- disabled: true,
+ disabled: disabled,
rules: [
{ required: true, message: '瀛愪换鍔＄被鍨嬩笉鑳戒负绌�', trigger: 'blur' },
],
@@ -229,18 +229,23 @@
{
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: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+ placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴�',
},
// {
// label: '鍙彉鍙橀噺1',
--
Gitblit v1.9.3