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

---
 PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx |  169 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
index beddd1a..3470564 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
@@ -116,6 +116,84 @@
                    } 
                 }, 
                 { 
+                   label: '绠℃缂栫爜', 
+                   prop: 'pipeSpecCode', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈电紪鐮�', 
+                   highSelectAttrs:{ 
+                     prop: 'pipeSpecCode_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
+                   label: '绠℃鍚嶇О', 
+                   prop: 'pipeSectionName', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈靛悕绉�', 
+                   highSelectAttrs:{ 
+                     prop: 'pipeSectionName_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
+                   label: '绠℃鍨嬪彿', 
+                   prop: 'pipeSpecMode', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈靛瀷鍙�', 
+                   highSelectAttrs:{ 
+                     prop: 'pipeSpecMode_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
+                   label: '宸ュ簭鍚嶇О', 
+                   prop: 'processName', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ伐搴忓悕绉�', 
+                   highSelectAttrs:{ 
+                     prop: 'processName_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
+                   label: '鑸瑰彿', 
+                   prop: 'shipNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヨ埞鍙�', 
+                   highSelectAttrs:{ 
+                     prop: 'shipNumber_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
+                   label: '椤圭洰鍙�', 
+                   prop: 'projectNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ラ」鐩彿', 
+                   highSelectAttrs:{ 
+                     prop: 'projectNumber_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
+                   } 
+                }, 
+                { 
                    label: '璁″垝鐘舵��', 
                    prop: 'workPlanStatus', 
                    el: 'select', 
@@ -143,6 +221,19 @@
                      el: 'select',  
                      placeholder: '璇烽�夋嫨',  
                      options:FILTER_MODE_OPTIONS_BOOL 
+                   } 
+                }, 
+                { 
+                   label: '宸ヨ壓娴佸悜缂栧彿', 
+                   prop: 'processRouteNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ伐鑹烘祦鍚戠紪鍙�', 
+                   highSelectAttrs:{ 
+                     prop: 'processRouteNumber_FilterMode', 
+                     el: 'select',  
+                     placeholder: '璇烽�夋嫨',  
+                     options:FILTER_MODE_OPTIONS_STRING 
                    } 
                 }, 
                 { 
@@ -452,45 +543,6 @@
                    } 
                 }, 
                 { 
-                   label: '鑸瑰彿', 
-                   prop: 'shipNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ヨ埞鍙�', 
-                   highSelectAttrs:{ 
-                     prop: 'shipNumber_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
-                   label: '椤圭洰鍙�', 
-                   prop: 'projectNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ラ」鐩彿', 
-                   highSelectAttrs:{ 
-                     prop: 'projectNumber_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
-                   label: '宸ュ簭鍚嶇О', 
-                   prop: 'processName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ伐搴忓悕绉�', 
-                   highSelectAttrs:{ 
-                     prop: 'processName_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
                    label: '绠′欢缂栫爜', 
                    prop: 'pipeFittingCode', 
                    el: 'input', 
@@ -511,32 +563,6 @@
                    placeholder: '璇疯緭鍏ラ『搴忓彿', 
                    highSelectAttrs:{ 
                      prop: 'preSerialNumber_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
-                   label: '绠℃缂栫爜', 
-                   prop: 'pipeSpecCode', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ娈电紪鐮�', 
-                   highSelectAttrs:{ 
-                     prop: 'pipeSpecCode_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
-                   label: '绠℃鍚嶇О', 
-                   prop: 'pipeSectionName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ娈靛悕绉�', 
-                   highSelectAttrs:{ 
-                     prop: 'pipeSectionName_FilterMode', 
                      el: 'select',  
                      placeholder: '璇烽�夋嫨',  
                      options:FILTER_MODE_OPTIONS_STRING 
@@ -594,19 +620,6 @@
                    placeholder: '璇疯緭鍏ユ潗璐�', 
                    highSelectAttrs:{ 
                      prop: 'material_FilterMode', 
-                     el: 'select',  
-                     placeholder: '璇烽�夋嫨',  
-                     options:FILTER_MODE_OPTIONS_STRING 
-                   } 
-                }, 
-                { 
-                   label: '宸ヨ壓娴佸悜缂栧彿', 
-                   prop: 'processRouteNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ伐鑹烘祦鍚戠紪鍙�', 
-                   highSelectAttrs:{ 
-                     prop: 'processRouteNumber_FilterMode', 
                      el: 'select',  
                      placeholder: '璇烽�夋嫨',  
                      options:FILTER_MODE_OPTIONS_STRING 

--
Gitblit v1.9.3