diff --git a/.collaboration b/.collaboration index 33805d07..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -614,17 +614,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T13:48:46.7133697+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -1432,46 +1422,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T13:49:26.273066+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\裁剪并上传图片-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 7ff227dd..ac8dfc81 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -334,8 +334,7 @@ "14,23": "计划工期(天):", "14,27": "=DATEDIF(F12,Q12)", "16,1": "项目方案:", - "19,1": "预算方案:", - "21,13": "权限" + "19,1": "预算方案:" }, "Formulas": { "1,33": "IF(C23,H23,G23)", @@ -533,12 +532,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "4b5c2da2-be3c-4c45-8a8d-7a1908bcee62" + "ID": "dca3d09b-3dda-4aef-bcea-6fe080536ee0" } ] } ], - "ID": "ce1370ce-e2fc-45a0-ae13-acd031d5ff8d" + "ID": "31d06bfa-8d06-44f8-a965-bf1e5fd3e6ef" }, { "Condition": { @@ -564,7 +563,7 @@ "MethodName": "Refresh" } ], - "ID": "5c1db61f-35fb-4b69-aeb2-542770738351" + "ID": "d39d1bc8-b7c5-45e8-b310-7e5dec43412c" } ] } @@ -1844,16 +1843,6 @@ "2,34": 5, "3,4": 7, "3,20": 8, - "3,22": 0, - "3,23": 0, - "3,24": 0, - "3,25": 0, - "3,26": 0, - "3,27": 0, - "3,28": 0, - "3,29": 0, - "3,30": 0, - "3,31": 0, "3,32": 3, "3,34": 5, "4,1": 9, @@ -2214,7 +2203,6 @@ "22,8,1,3", "3,4,1,16", "1,4,1,16", - "1,21,1,11", "6,1,1,4", "6,5,1,6", "6,12,1,4", @@ -2224,7 +2212,8 @@ "8,1,1,4", "8,5,1,6", "8,16,1,6", - "8,12,1,4" + "8,12,1,4", + "1,21,3,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2257,4 +2246,4 @@ "Formula": "项目审批!$I$23" } ] -}//dpR3NRxMgtwTVEH4YXmwOFT+vMSpPNnUYBtgpVqyYRTNH9i+X8LVkkLILI6MFf6herjKinwxAeK01MbrKZpbpaU72hUzUIlFfHOA+rBojTwgA+TjBltZdKltbRK7C+mqsyK7Vfgfh6aaY8R41VBErOhtNjfh6iGgJrNtcXmbAXBbT2jXB9ugDc7s9kki9wGYqYiAadR0OjCpFYTXCBzD9ZjGLgJ86zdqj+ArxBB3fMwolsBzjmG6BEVo/1v78+76hZOygZiURbI3WSjYKWt7Wt8/rVAvC+Ttad2j6AcIRCUH1V+Ygb212sbxVRV0ZPiKlmltZz/8XrO6v2uBqDCTqJQrquxCRCRP/Yt7hmdb2SbxzIZmfixQhz9LBtHkxSXMwDie58JWStDw5IPaywfd7rROXm1IC+23FBdohkoMVX7iGl64aUvN/EEYASWGS2krc76DhTaLfTJJO6qwXysz5hgIN09ej3UT38dnAkvpYar/LN6dljWXn9rMWHAMhFkJwq2BjKxt0ZoTKilLp6/LJ82oiaSD1UjD8ok14SffxpNv3IjG6OBK4ptZxlZM0TwAXvW/2D67zR9TEdgt436QLWdJM5qlkUgKDD6llX3UqtjJGFQJLhTRGlW+/1bQQCgwCdnLZN2RMWfSGrC2k+u1OuvaOfKu7LhIP+AwXpC3B5Gm7XtwkDkHwUPW19dkvC9L333IgcLMeey+GEoUzDmDcXSYw41+Kq2ncjHuRozeoZnI4vxD5/sSSQpNs9YDyCOnpsI1sQmYhoLy/6j5frnoQCFDF+kSfe10F0qlrmieVZLaAssGm0IvWyh8S/aJRNFHQqy6KMT8jTelZcS+ZHFZnQn85az44dHwyisDsnmvWloy13K37K8kT/e7HZVi/FL8IBc3rFf/eM7HMWoJkJhr4g==|920 \ No newline at end of file +}//P2pH6iSDaKfYQc5l4cE5IU0+0MUBt28/OZjOmb8WhGxuBKg7zqxrJrn4czVTmSbUVFHgBPqskjGacdxCrA5J9/U2ittzMZVbrbQ6W7rb7oy0VWjMc54GCXp7pGNy+EWhN4kTUpITFo3nq4WU+5GBiz1pCyBgbAB/vf/9gDDfdNnqoqHw++M+DVMW6y9JC6E1no0Eq8dRUrft3aCOoQHOJNLElRHrt6xMmQBUaNfLQhgNWqYyMzgyWLV/zLNVyQgKrZY2dknuxrTc3Uj+ti423cQeJoT/J9m/InROE1RLDWXswy0lO3OZtIKXKtVhVUKs3RjbXA0OKU1k6EOPKoUMb8VC9QwNLNMO9D2OYwJshrzDEYOVi7axsc9fW6gJu9AmsMnQUOTC8ii90ISpyWknPwXvNndywKNwRm/IVCZWN4tKsY3fqvIWjtqhOIWwS7gdC00Mkp4jGMPEKJQ0CIjX0N4PEuKqWYpQVzriqqrsnehqRGaNk5PmP+1AIznPuzWRoAi2jQGn59Z2My0U/JKK7joT/KiaspHyYoLJEdEQJbKXYvrHIXwPkdVyJTQgdWiTAoGB3TOpINPTITIWlhMtkDSpkSvrbWyq84Rf8frttNh2yPi4T/orBSFRd5RSpv5F/NJxC/vsdrqXdX8q5YUGqMFxLdmNTH9p6ObzsEkMFqZIo0zutp/rkBr3T3GIHpMUPJ8sPQn869R5wal5xq+jSTmX69Z6WdhYGhSg+xazP6KrJCK5oZtz8KT1fgaaDFp1iZHWsx+Nmcix05qDQL8RCmpiNdFuevI9cVDtgxbHBBRrcyinZCE1XoA4MFAD9S5Z7wERp5NLwlwW/9jbn5SqLFSJgJVJltMziqOHJFUhn/MqM5fbTNzYhVuZ7M2E737Ul92VKpeMAMKZ6yymZ7yqog==|920 \ No newline at end of file diff --git a/Plugin/Unlayer-9_0_103_0.zip b/Plugin/Unlayer-9_0_103_0(1).zip similarity index 95% rename from Plugin/Unlayer-9_0_103_0.zip rename to Plugin/Unlayer-9_0_103_0(1).zip index 20e37a86..32c75080 100644 Binary files a/Plugin/Unlayer-9_0_103_0.zip and b/Plugin/Unlayer-9_0_103_0(1).zip differ