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/WorkPlan/Views/Pages/WorkPlan/Config.ts |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
index e26a8f8..7b6a5e0 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
@@ -10,6 +10,36 @@
   width:160, 
 }, 
 { 
+  field: 'pipeSpecCode', 
+  title: '绠℃缂栫爜', 
+  width:160, 
+}, 
+{ 
+  field: 'pipeSectionName', 
+  title: '绠℃鍚嶇О', 
+  width:160, 
+}, 
+{ 
+  field: 'pipeSpecMode', 
+  title: '绠℃鍨嬪彿', 
+  width:160, 
+}, 
+{ 
+  field: 'processName', 
+  title: '宸ュ簭鍚嶇О', 
+  width:160, 
+}, 
+{ 
+  field: 'shipNumber', 
+  title: '鑸瑰彿', 
+  width:160, 
+}, 
+{ 
+  field: 'projectNumber', 
+  title: '椤圭洰鍙�', 
+  width:160, 
+}, 
+{ 
   field: 'workPlanStatusDesc', 
   title: '璁″垝鐘舵��', 
   width:160, 
@@ -17,6 +47,11 @@
 { 
   field: 'callMaterialStatusDesc', 
   title: '鍙枡鐘舵��', 
+  width:160, 
+}, 
+{ 
+  field: 'processRouteNumber', 
+  title: '宸ヨ壓娴佸悜缂栧彿', 
   width:160, 
 }, 
 { 
@@ -105,13 +140,8 @@
   width:160, 
 }, 
 { 
-  field: 'workpieceName', 
-  title: '宸ヤ欢鍚嶇О', 
-  width:160, 
-}, 
-{ 
-  field: 'processName', 
-  title: '宸ュ簭鍚嶇О', 
+  field: 'prodLineCode', 
+  title: '浜х嚎缂栫爜', 
   width:160, 
 }, 
 { 
@@ -122,16 +152,6 @@
 { 
   field: 'preSerialNumber', 
   title: '椤哄簭鍙�', 
-  width:160, 
-}, 
-{ 
-  field: 'pipeSpecCode', 
-  title: '绠℃缂栫爜', 
-  width:160, 
-}, 
-{ 
-  field: 'pipeSectionName', 
-  title: '绠℃鍚嶇О', 
   width:160, 
 }, 
 { 
@@ -147,11 +167,6 @@
 { 
   field: 'material', 
   title: '鏉愯川', 
-  width:160, 
-}, 
-{ 
-  field: 'processRouteNumber', 
-  title: '宸ヨ壓娴佸悜缂栧彿', 
   width:160, 
 }, 
 { 

--
Gitblit v1.9.3