From f83acb82307f2c69ec4e3937a56db2770e4e069b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 15:49:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx |   70 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
index cc3233c..f4ed707 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
@@ -102,6 +102,7 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
@@ -145,6 +146,7 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
@@ -160,6 +162,7 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
@@ -175,6 +178,7 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
@@ -190,6 +194,7 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
@@ -230,10 +235,11 @@
           ...attrs,
         })
       },
+      width: '100%',
       step: 1,
       precision: 0,
       //disabled: disabled,
-      placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+      placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴�',
     },
     {
       label: '鍙彉鍙橀噺1',
@@ -256,21 +262,30 @@
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3',
     },
-
+    {
+      label: '鏄惁绂佺敤',
+      prop: 'isDisabled',
+      el: 'select',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+      options: [
+        { label: '鏄�', value: 'true' },
+        { label: '鍚�', value: 'false' },
+      ],
+    },
     {
       label: '鍒涘缓鏃堕棿',
-      prop: 'operateTime',
+      prop: 'creationTime',
       el: (props: any, { attrs }: SetupContext) => {
-        return h(datePickerRange, {
+        return h(dateTimePickerRange, {
           ...props,
           clearable: true,
           ...attrs,
         })
       },
-      step: 1,
-      precision: 0,
+      width: '100%',
       //disabled: disabled,
-      placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+      placeholder: '璇疯緭鍏�',
     },
   ])
   /**
@@ -284,27 +299,27 @@
     return check
   }
   const commonGetFormData = () => {
-    console.log(formData.value.operateTime)
     const data = {
-      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,
-      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,
-      creationTime: formData.value.operateTime,
+      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 || '',
+      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 || '',
+      isDisabled: formData.value.isDisabled || '',
+      creationTime: formData.value.creationTime || '',
     }
     return data
   }
@@ -345,7 +360,6 @@
     formData.value.MutableParam1 = ''
     formData.value.MutableParam2 = ''
     formData.value.MutableParam3 = ''
-    formData.value.operateTime = []
     //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
     ctx.emit('restQuery')
   }

--
Gitblit v1.9.3