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/WorkTaskDrawer.tsx |   91 ++++++++++++++++++++++++---------------------
 1 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
index 23527b4..f4b02ad 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
@@ -98,6 +98,48 @@
               rules: [{required: true, message: '浠诲姟缂栫爜涓嶈兘涓虹┖', trigger: 'blur' }], 
                 }, 
                 { 
+                   label: '绠℃缂栫爜', 
+                   prop: 'pipeSpecCode', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈电紪鐮�', 
+                }, 
+                { 
+                   label: '绠℃鍚嶇О', 
+                   prop: 'pipeSectionName', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈靛悕绉�', 
+                }, 
+                { 
+                   label: '绠℃鍨嬪彿', 
+                   prop: 'pipeSpecMode', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ娈靛瀷鍙�', 
+                }, 
+                { 
+                   label: '宸ュ簭鍚嶇О', 
+                   prop: 'processName', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ伐搴忓悕绉�', 
+                }, 
+                { 
+                   label: '鑸瑰彿', 
+                   prop: 'shipNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヨ埞鍙�', 
+                }, 
+                { 
+                   label: '椤圭洰鍙�', 
+                   prop: 'projectNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ラ」鐩彿', 
+                }, 
+                { 
                    label: '璁″垝鐘舵��', 
                    prop: 'workPlanStatus', 
                    el: 'select', 
@@ -116,6 +158,13 @@
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏ュ彨鏂欑姸鎬�', 
               rules: [{required: true, message: '鍙枡鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }], 
+                }, 
+                { 
+                   label: '宸ヨ壓娴佸悜缂栧彿', 
+                   prop: 'processRouteNumber', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ伐鑹烘祦鍚戠紪鍙�', 
                 }, 
                 { 
                    label: '鍘熸枡鏍囪瘑', 
@@ -324,27 +373,6 @@
                    placeholder: '璇疯緭鍏ヤ骇绾跨紪鐮�', 
                 }, 
                 { 
-                   label: '鑸瑰彿', 
-                   prop: 'shipNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ヨ埞鍙�', 
-                }, 
-                { 
-                   label: '椤圭洰鍙�', 
-                   prop: 'projectNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ラ」鐩彿', 
-                }, 
-                { 
-                   label: '宸ュ簭鍚嶇О', 
-                   prop: 'processName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ伐搴忓悕绉�', 
-                }, 
-                { 
                    label: '绠′欢缂栫爜', 
                    prop: 'pipeFittingCode', 
                    el: 'input', 
@@ -357,20 +385,6 @@
                    el: 'input', 
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏ラ『搴忓彿', 
-                }, 
-                { 
-                   label: '绠℃缂栫爜', 
-                   prop: 'pipeSpecCode', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ娈电紪鐮�', 
-                }, 
-                { 
-                   label: '绠℃鍚嶇О', 
-                   prop: 'pipeSectionName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ娈靛悕绉�', 
                 }, 
                 { 
                    label: '澶栧緞(mm)', 
@@ -412,13 +426,6 @@
                    el: 'input', 
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏ユ潗璐�', 
-                }, 
-                { 
-                   label: '宸ヨ壓娴佸悜缂栧彿', 
-                   prop: 'processRouteNumber', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ伐鑹烘祦鍚戠紪鍙�', 
                 }, 
                 { 
                    label: '璁″垝寮�濮嬫椂闂�', 

--
Gitblit v1.9.3