From e518a3164972132d43f6d5118b6ddbb9d653dfed Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Tue, 3 Sep 2024 12:09:10 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82?=
 =?UTF-8?q?=E5=86=B5"},{"State":1,"Type":1,"Name":"PCPage/=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=9B=E5=B1=95"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                                |  26 +-
 .../项目首页-容器页面/项目进展/新增进展.json  | 407 ++++++++++++++----
 .../项目首页-容器页面/项目进展/新增进展.rd    |   6 +-
 3 files changed, 320 insertions(+), 119 deletions(-)

diff --git a/.collaboration b/.collaboration
index 02f838a0..dd52144a 100644
--- a/.collaboration
+++ b/.collaboration
@@ -610,19 +610,7 @@
   },
   {
     "ModuleName": "PCPage/项目概况",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-03T12:05:35.9260882+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd",
-      "Pages\\f9ec059d9c5d440eabbb7db442b15c9.json",
-      "Pages\\f9ec059d9c5d440eabbb7db442b15c9.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/项目周报首页",
@@ -642,17 +630,7 @@
   },
   {
     "ModuleName": "PCPage/新增进展",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-03T12:05:35.9253851+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目进展\\新增进展.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目进展\\新增进展.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/项目发布",
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json
index 66a81eb3..beefe70a 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json
@@ -1,32 +1,73 @@
 {
   "Rows": {
     "RowColumnAttachedInfos": {
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
-        }
-      },
-      "2": {
+      "0": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 24.0
         }
       },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 16.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 592.0
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 16.0
         }
       },
       "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 410.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "11": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 33.0,
           "IsHidden": true
         }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
       }
     },
     "InLogicalVisibleIndexes": [
-      5
+      11
     ],
-    "Count": 6
+    "Count": 12,
+    "DefaultSize": 32.0
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -92,7 +133,7 @@
       },
       "12": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 10.0
         }
       },
       "13": {
@@ -100,6 +141,61 @@
           "DesignLengthInPixel": 32.0
         }
       },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "22": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "23": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "24": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "25": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
       "26": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -109,68 +205,21 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
-      },
-      "28": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "29": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "30": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "31": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "32": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "33": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "34": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "35": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "36": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "37": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
       }
     },
-    "Count": 38,
+    "Count": 28,
     "DefaultSize": 32.0
   },
   "Values": {
-    "1,1": "状态正常",
-    "1,24": "项目进度",
-    "1,33": "提交"
+    "1,1": "进展状态",
+    "1,4": "状态正常",
+    "3,1": "项目进度",
+    "5,1": "进展描述",
+    "9,17": "取消",
+    "9,23": "提交"
   },
   "AttachInfos": {
-    "1,1": {
+    "1,4": {
       "BindingInfo": {
         "TableName": "项目进展",
         "ColumnName": "进展类型",
@@ -197,7 +246,7 @@
         ]
       }
     },
-    "1,25": {
+    "3,4": {
       "BindingInfo": {
         "TableName": "项目表",
         "ColumnName": "进度",
@@ -226,7 +275,29 @@
         "controls": false
       }
     },
-    "1,33": {
+    "7,1": {
+      "BindingInfo": {
+        "TableName": "项目进展",
+        "ColumnName": "进展内容",
+        "GUID": "17b8ee9c-660b-4f8a-bf44-e38bec656da5"
+      },
+      "CellType": {
+        "$type": "editormdPlugin.editormdPlugin, editormdPlugin"
+      }
+    },
+    "9,17": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+          }
+        ],
+        "Text": "取消",
+        "TemplateKey": "_RS_Information3"
+      }
+    },
+    "9,23": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -252,17 +323,7 @@
         "c3306eb4-0182-47cc-af13-0e758252b6eb"
       ]
     },
-    "3,1": {
-      "BindingInfo": {
-        "TableName": "项目进展",
-        "ColumnName": "进展内容",
-        "GUID": "17b8ee9c-660b-4f8a-bf44-e38bec656da5"
-      },
-      "CellType": {
-        "$type": "editormdPlugin.editormdPlugin, editormdPlugin"
-      }
-    },
-    "5,1": {
+    "11,1": {
       "BindingInfo": {
         "TableName": "项目进展",
         "ColumnName": "项目ID",
@@ -273,13 +334,19 @@
   "StyleDatas": {
     "Styles": [
       {
-        "FontSize": 13.333333333333332
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontFamily": 0
       },
       {
         "FontFamily": 0,
-        "FontSize": 13.333333333333332,
-        "TextIndent": 10,
-        "HorizontalAlignment": 1
+        "FontSize": 13.333333333333332
+      },
+      {
+        "FontSize": 13.333333333333332
       },
       {
         "Background": 2,
@@ -289,26 +356,182 @@
     "Types": {
       "Strs": [
         "Body",
-        "Right",
+        "Left",
         "#FFFFFF00"
       ]
     },
     "CellStyles": {
       "1,1": 0,
-      "1,24": 1,
+      "1,2": 1,
+      "1,4": 2,
+      "2,1": 3,
+      "2,2": 3,
+      "2,3": 3,
+      "2,4": 3,
+      "2,5": 3,
+      "2,6": 3,
+      "2,7": 3,
+      "2,8": 3,
+      "2,10": 0,
+      "2,11": 0,
+      "2,12": 0,
+      "2,18": 2,
+      "2,19": 2,
+      "2,20": 2,
       "3,1": 0,
-      "5,1": 2
+      "3,2": 1,
+      "3,3": 0,
+      "3,4": 2,
+      "4,0": 1,
+      "4,1": 2,
+      "4,2": 2,
+      "4,3": 2,
+      "4,4": 2,
+      "4,5": 2,
+      "4,6": 2,
+      "4,7": 2,
+      "4,8": 2,
+      "4,9": 1,
+      "4,10": 0,
+      "4,11": 0,
+      "4,12": 0,
+      "4,13": 1,
+      "4,14": 1,
+      "4,15": 1,
+      "4,16": 1,
+      "4,17": 1,
+      "4,18": 2,
+      "4,19": 2,
+      "4,20": 2,
+      "4,21": 1,
+      "4,22": 1,
+      "4,23": 1,
+      "4,24": 1,
+      "4,25": 1,
+      "4,26": 1,
+      "4,27": 1,
+      "5,0": 1,
+      "5,1": 0,
+      "5,2": 1,
+      "5,3": 2,
+      "5,4": 2,
+      "5,5": 2,
+      "5,6": 2,
+      "5,7": 2,
+      "5,8": 2,
+      "5,9": 1,
+      "5,10": 0,
+      "5,11": 0,
+      "5,12": 0,
+      "5,13": 1,
+      "5,14": 1,
+      "5,15": 1,
+      "5,16": 1,
+      "5,17": 1,
+      "5,18": 2,
+      "5,19": 2,
+      "5,20": 2,
+      "5,21": 1,
+      "5,22": 1,
+      "5,23": 1,
+      "5,24": 1,
+      "5,25": 1,
+      "5,26": 1,
+      "5,27": 1,
+      "6,0": 1,
+      "6,1": 0,
+      "6,2": 0,
+      "6,3": 2,
+      "6,4": 2,
+      "6,5": 2,
+      "6,6": 2,
+      "6,7": 2,
+      "6,8": 2,
+      "6,9": 1,
+      "6,10": 0,
+      "6,11": 0,
+      "6,12": 0,
+      "6,13": 1,
+      "6,14": 1,
+      "6,15": 1,
+      "6,16": 1,
+      "6,17": 1,
+      "6,18": 2,
+      "6,19": 2,
+      "6,20": 2,
+      "6,21": 1,
+      "6,22": 1,
+      "6,23": 1,
+      "6,24": 1,
+      "6,25": 1,
+      "6,26": 1,
+      "6,27": 1,
+      "7,1": 3,
+      "8,1": 3,
+      "8,2": 3,
+      "8,3": 3,
+      "8,4": 3,
+      "8,5": 3,
+      "8,6": 3,
+      "8,7": 3,
+      "8,8": 3,
+      "8,9": 3,
+      "8,10": 3,
+      "8,11": 3,
+      "8,12": 3,
+      "8,13": 3,
+      "8,14": 3,
+      "8,15": 3,
+      "8,16": 3,
+      "8,17": 3,
+      "8,18": 3,
+      "8,19": 3,
+      "8,20": 3,
+      "8,21": 3,
+      "8,22": 3,
+      "8,23": 3,
+      "8,24": 3,
+      "8,25": 3,
+      "8,26": 3,
+      "9,1": 3,
+      "9,2": 3,
+      "9,3": 3,
+      "9,4": 3,
+      "9,5": 3,
+      "9,6": 3,
+      "9,7": 3,
+      "9,8": 3,
+      "9,9": 3,
+      "9,10": 3,
+      "9,11": 3,
+      "9,12": 3,
+      "9,13": 3,
+      "9,14": 3,
+      "9,15": 3,
+      "9,16": 3,
+      "9,17": 3,
+      "9,21": 3,
+      "9,22": 3,
+      "9,23": 1,
+      "9,24": 1,
+      "9,25": 1,
+      "9,26": 1,
+      "11,1": 4
     },
     "SheetStyle": {
       "FontFamily": 0
     }
   },
   "Spans": [
-    "1,33,1,4",
-    "5,1,1,4",
-    "1,1,1,11",
-    "3,1,1,36",
-    "1,25,1,7"
+    "11,1,1,4",
+    "7,1,1,26",
+    "3,1,1,2",
+    "1,1,1,2",
+    "9,23,1,4",
+    "1,4,1,23",
+    "5,1,1,2",
+    "9,17,1,4",
+    "3,4,1,23"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -356,7 +579,7 @@
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "新增进展!$B$6"
+      "Formula": "新增进展!$B$12"
     }
   ]
-}//l8HjSMIrRG/wpGIv7yBdU9NTkF9Na0xtwgY1j1xCpmRAzACMokiSE64L/vETo3PSEpqZVgMHF+PcQLHEntsBlAmr2ECuYDQrOlH5RjAQPvfvHSsw9NzTEIekslX2zHPuuZ9OTStHJSzAeU2sMX/eZ5WF+tBQkequVlgCulxIqt2OjLECgQxKrKV/BS9v/z6BgKjO74VQUUlJjmcrJl4Uyb2kFcEp9BkN7byXyifwKTkGB1WuwgTyoYB1LaFqysNzUPHp9cr4b6Z/NYaaW3fWow0Egt60OaZsZZOdSOqea5Sn96nIaQstLx3TAufJSq1Kmab8yoyvt3tbpZJ2+NPoLhSYn8w7PMmQMANFzRKWHrqF1kD7L43rJM0B0rx3+z7nRgeKVaKwnCFr5X74YGWhX0fBGieERiw44BPXSjNP7TRvgbQxz39Gr2be/BDPNtVmU4Q0AnxUxeCQ5DykZtu6PlucTvdjBBd4HSqaBGXlTc76R3HjnNj+WVoHNYL7nt0CFjb7Bjp9j93STBKkLMQdV6R1koOKnW3/XhnyaSaRr4pfO1Gw3Ms9BSR8baNJPMp6Tbylpa1Jw3mHCyPjEVIdHjBpWcgy1xYK3IhePi6ECZkf51ZUr2u7dz/VVKn+6aX6DXPLp7v0UEN3OsUkrNTbwE9WaEd+AknEk2f/T34qBZb6iCsiB1lhRjOBdK9DLPd1Q7MqDnlOi+uhjzkpkPkVkBHIvSUxrSZTuHzNR5jqKpXOIThvN3lnHsnhfRvS/mtk2DlXJ87XNXKF1cC9ULNrCy3I64VmgXeNVxJzm2pzVKoEOlC+3ozZM3Gl8Zw6jPLzkpIcsqYEes+YWYh7RUutvxlbJMvkY30v68+wkEWPE4QPh9vz+BCiaE3YoSpJNPa36sZ20QRbsg3El82eFB3moA==|920
\ No newline at end of file
+}//jXflCV+hSd29sXicikoLcOyhj/g+DyKovO2V7xpIr6jSeLAivND5ed0Mq8sCcXtT9B2Jibm8vp3ysAgo5JDS8NhO1FVd9w66WTrHG6dVTsydAbAPZCJERQGAQ+EYg0ZVEh75hxB2Rvd67lBAX9zKELGZAnInyl49Eba3B9iTKE0PYj8Rlvs7fO/E9w1vJzAQsNvT8z85zOfujxPO0fUqKSjZ+O5xXbUAFd87Cl52FBkYNbbCDZx0wT4rOyxa7uxBhvUzxoHJpuhe7zsTwfplQSJGZOgtLVVZrfiXo+3qgdDCHk9RYCYsUXuKZkYucpBmj5qNW0mEKLXbQeNcpDA7QxRZD1iqqhIJVlwxSZlk6t5XIgDXSmIIYBD3jleFRfQixf5w+J4JQW8Tbdk/o3VDSuBip2lZacAeH77v8IZzcnNcvqicTech7SUr0zeWFTJEvGJU4B3OXZnrKZ/iGOnIHGUpwAXTM/0YlHpOuWZmTuVO+2PLCYafQqko+17UZG+G8ng2uEjuXaA20KLvYvkQ/O6cwMsPrdJzeURftNjXPOT98YB1yby6gVUFjfqOa30SEg8TogvaABLLxNTL9b2FO9ue2UGSB0Ajwg1hF/Ht8oUskZaf8JMbhrPpO+XE2ha/Sm/My32IzjfzLfwmM3t1jy1DlBtUk9ULdgywoO3e2wLWAJamVFxUYDHeCSl3WyeEuN9q3gV1qktntYHdWTHZ+uh/W9Sl2EDoDxuAo4Mbw4Ja98iMItzT6DOcCTgXHZrvGwYhOkXMnt655WIS5NutuPCTE+daCe6cTAhGNJG15BBtkHEi+E/ZHKW2xIAE+YP+swTXB60+Cq0AuHhi2a57R7vvIObrrrAZtCANVgTrS1xE8vVpcnNHnHlaYuvyxx5eqiAugPVYWieWqd+1Ugc66Q==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd
index 28faa9f8..3213a51f 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd
@@ -1,11 +1,11 @@
 {
   "PageType": 0,
-  "ColumnCount": 38,
-  "RowCount": 6,
+  "ColumnCount": 28,
+  "RowCount": 12,
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "新增进展!$B$6"
+      "Formula": "新增进展!$B$12"
     }
   ]
 }
\ No newline at end of file