From aee75fe7fd159a7db4b0ce51771ccfc8f6964665 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Thu, 19 Sep 2024 10:04:19 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=8C=89=E9=92=AE=E7=9A=84=E9=9A=90=E8=97=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91","MessageType":2,"Modules":[{"State":1,"Type":1,"Name?= =?UTF-8?q?":"PCPage/=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF"},{"State":1,"Ty?= =?UTF-8?q?pe":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"?= =?UTF-8?q?State":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6"},{"Stat?= =?UTF-8?q?e":1,"Type":40,"Name":"Plugin"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 95 +-------------- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 12 +- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 +-- Pages/项目/项目首页/项目配置/项目信息.json | 113 ++++++++++-------- .../项目首页/项目首页-容器页面/任务列表.json | 56 ++++----- .../项目首页-容器页面/任务容器页面/任务-工时.json | 48 ++++---- ...箱-9_0_6_0.zip => UI操作工具箱-9_0_103_0.zip} | Bin 90162 -> 92734 bytes ServerCommands/工时/上报实际工时.json | 27 +++-- 8 files changed, 147 insertions(+), 220 deletions(-) rename Plugin/{UI操作工具箱-9_0_6_0.zip => UI操作工具箱-9_0_103_0.zip} (88%) diff --git a/.collaboration b/.collaboration index f7a5d642..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -474,17 +474,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-19T10:02:39.9055574+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -576,19 +566,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-19T09:48:28.0164016+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情", @@ -616,19 +594,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-19T09:49:43.3219282+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷子页面", @@ -1432,16 +1398,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-19T09:57:45.2616228+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/客户", @@ -2293,49 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-19T09:47:30.5368918+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "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(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\内容编辑器-9_0_103_0.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(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_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", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 0e9d28c2..8791cec5 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -141,7 +141,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "1656ff77-abfa-45ce-86a4-899bf5fce72b" + "ID": "47fe0b74-89d4-4635-9f96-a7c431cf8fa7" }, { "CommandList": [ @@ -170,7 +170,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "dbe35d8c-8a93-4dc2-98a3-574f051eb134" + "ID": "02cf4268-599c-4efe-85a3-a151e0de9eff" }, { "CommandList": [ @@ -180,17 +180,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "b48a77d0-72af-4278-9b9f-9dd32b1a1cd0" + "ID": "92f07b84-7b91-4ac9-8301-b4076cac5f33" } ] } ], - "ID": "ba303490-bc81-4396-935a-02f30ff06f26" + "ID": "8fa3513c-6439-4a4f-9034-760ca930ba90" } ] } ], - "ID": "c305bad7-e5a8-4298-9e05-8aab7287da74" + "ID": "77280535-ade9-4d39-8519-751ba0a2f5b7" } ] } @@ -258,4 +258,4 @@ "PaperSize": {}, "Margin": {} } -}//M2rITRIw5YCk7wtBDCHXs+A2pf3A4OD36+HgjEQZJst34tkVmaxY+DIlNUwP9ec0yHsFt1KYHkvs/PChAhr35c4q3vsIg6G3+n9XmPnNqQp4Hns6RUecmDlfpRMzXpEo2YPjrzryW4gdndFBOUyUXwo7pm45M9X1VmlAPvokJa7MKb5onDJEUUo8HTdRjE5YkC2m8t+iXcWUj/uR15umcxOHjzLGp7kkCaI4PjuKqbN2luDGpxnZJt9KoWXTwSWpvNIfHQj0yl8adTR2oEV4xkCfj2gkQX3gVDzAfO9DgbodY46EI7W/MX2YiBrWX5pErl0UMMOQDGkyII6ueBy7zoTerGbL/0yKIdmX/uC+iXrc1/VwopAC4RPWBuY9erbG7yJ/38RxH6729BuuL/U6sWap1T9kcKsxymaHDHR8NRtihVXmqa8/2X+ZtAuSuIv1GYvaW8nWEaV51Oaz+gsyF+tbDFnAZIQN9MmWjQ731KPS73f5pEj6+oQbxkl8YEjd+CID6VaM0JnXOptoteLbNLm+mPr6/mv8LsRh4wx4ZRxEEXle58FP4+bCAXPyrpZl2c4UWGlTa9ZnFVAJiJwgv/PrghNb/mCHOEvCSmMsdoX6b/JQqbs7yI8hS6oDVZTREpYQsJWKX+kdsIm1PPbhUq/jl38/IKq2kC/yUQ/BxR3fOCqaxaqPkZYph6Ma/MXBY8JWe5+paRrIyUJggM9OHh7i+X9EahKjDrIvE2V7/ga0fFFgrFrkm4BFmT2FOPoRFR7eFjGZzIwRgrR77X5uFYx55DS85EN3Erd7jhItic6Jm4IuDn9ZEnaEoq9oOb8bgPKN9ck64zGugAGPq8YqCE53h1Qgj8KI7TW/Vi1OLo1j6D/twuotnis8gvzTb23f/dxek8n7vAmXAVKyOssK+Q==|920 \ No newline at end of file +}//9hwtCNwdXZQQyCUfTzhqE1eba6NyKfmyec9mKWgzVOGxzUvrI6DghH5HHtxQ4naXMyttMZaTyDrQlFPZypBxPnlLebddV2oLDrO7bfu8FMqoE7QTQkZEpn/C7ivOsG5TNGFO4+kwJ/7m9/aDw82JHtz/XjEBDpiwaLmUsRo/Az2xPru8ssA9spEXNjRqyxa1zSN49RP12Hry1gCyb6mA59JRdpTfpSzaeGe9W1xCphSBjeG6IKULEZ+G1V0gsb4k4ECPLvq9cOWBf6P0afinr/3OH1185GU8n4Q3f8n4n4NTfnCEdIsaJyP6hMEC9Si3Km+Kysp1i1S72ObWxlbxFEoIZRZDV4wcF6NjBMl+peonfDPeVHUyU2hRPWu/NRjJjekUeSM8oUPnC/GHg+Hnm2vhirXx4ymju2rhqZ870+m80j01yh3D5auDlOx9oZOSySEwa/ewFnbLghNkKl2h+osO1ox7tNulNDsjA2BMMbH+3n5kO2uUWmkTbqpTDet2DSaC7hRT5jZ+QwrhrIFYZUsShpV0eOMseOb+Olxnw2UpEOt/tqRE0NUU4XwWM5X6ukJyB3XhRjX6Y2+3qZZQKSXwZobULefAp8f3m1fLW2Sw+vV1FaPtI12PKgQoxONTeSs9LsOTZ6gPkoEXLfXyMblbHt/7Sf899GZkVkxNM272YvmjXHp5NlYjW04ZpfD5BvE9VbCnxjBvbHIx0eok/MHlOGAmENi/45sL+/WW2ngCc6QCvSBcIcpwvnd2qQJ7gF94AI+H8HU2dRUtIK+/x1UDLXp7ZjTw0Wf8C6Xo9iH3ICGMlLCctykWUyxgUiBaOVq+/7OqRaQELCfgvU93j6O1vcGdcVx5XbRUwA8Ha4A7Rfd63yi5fY6OxUlVnqTflfefqa7+yApP0Bz2rqIfwg==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 0c10f585..9efec89f 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ ] } ], - "ID": "772126d7-a8b0-4960-a735-f0020c4069a1" + "ID": "c4022154-9e67-4c15-a0b5-69aa0da85ef1" } ] } @@ -228,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "d4481e9f-aa28-49d5-bb32-9e6bbb90c13e" + "ID": "ba35cd7f-3f7a-4694-b9db-b952abdbc05c" }, { "Condition": { @@ -258,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "014d89b8-3795-4296-ab09-2c97fad07dc4" + "ID": "c5529bdd-0456-42e8-aad2-d67737efec2a" }, { "Condition": { @@ -335,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "bfa54a00-2b6a-48b6-8acc-8cc886b5d9d8" + "ID": "e052f492-d47d-40fa-88b7-29f0fdb43384" }, { "CommandList": [ @@ -350,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "2eb08750-4681-4dda-9fc7-aa2bff031344" + "ID": "d1b46d06-5e86-4b7f-b1a2-30083ce70f4b" } ] } ], - "ID": "2f4d21bb-7e38-4635-8f6d-2a4c2be89faa" + "ID": "a71264ec-19cb-4baf-8648-c3b04e3a49d8" } ] } ], - "ID": "4c3d293c-08b9-4863-a18e-443675ea3f08" + "ID": "c72b5da1-ec3d-43aa-9cb8-6d532147b150" } ] } @@ -455,4 +455,4 @@ "Size": "24,24" } ] -}//VNhc6aUWmFD9PoFFusxzxkRJxNn7RzZ3EuoQ6k0+N4EeS4Q7vb7dMlg+434vtgZPQehBrtVUDFUiKenWX3ZhH2XIxxbnSekYnD/ROtSr0SKAyC2SCaTqAUAlS+OF8JFXLbw48jpJOOtSY7LSLZQPztZI1GN7wOYWPNA9uWx6k9g3MtDmpWtg+mpFfwECBzjMXBuLRSImZowkyNxOiSVlgB6UVNo/A/IYp57W7U2Pjm3k28hDTrrPTwptjuWfeg27w62OuNExiPrc7oTe0GCie7zzlEeYnJVSNAHzmhod4JarWbvoPKU5SQ9U4NMWSwVi7zgDI3+6ZIieCFtkk+lgEshwd+vxMO7+0U2cM3Z8V3/mrOfHSk3fIe+tsqaa5KmblfcVnJeV7g1I+gXESKQn5qIaqPIWiqxEnq8OCqLgaQK+hXehY+h8iETNbuHXnPUMEwKBK8SVJZRkfu1L5Z8TzDWVn2G3umhR1MssouW639v0C6tP1MMgN7wgWw2SknxbElvSsiC7RiqoBUFCELQD3BzBJeU8ycRsURdWMEE1bwWPsawKQXOPyQqNZ9+X4geVGpLwOaDbrFE1biFRUKGdt1Ox0fiFV3LQhqrcf4CVNca+XR2XcOpns0QMbzwJEQAe6k/qGMkuVruHVRX+iNfaD/uG/R3HVIqTcut1KrRhll1AQxIuP7FoDAGuO1fooxfg986/ZJusiq9HGupg+C/hndX0HzVCYCkcP8RCQukeW8kXSdDUI6iB8VxBFwNOACCba1jXWMnRuAQurYh0ptNiRdq6wlJ3dERg4bYFm5zNunoJj2T9xZU8c+3Ng4r8Yszy+ddoizAb/G4cYM4B1xQDp//sNQZyazt3Ofy7BszixCGMA+miSxJ2CqaTp0FNW/xAGD73BtOfoTL7MwHJZQUnYw==|920 \ No newline at end of file +}//7IxLoFoZTO6aSUsMESeIxzosBwx73kHnW16AuG4DgpW/ybA/q2p0FZR+P5iyyThQzjxZ2aM4dpuhi+yJAA4Pka7gBXTYK9nlKtD0kkd0gSNV5V5pO18F65YEj62dWAlibLfgFziDR16gff1Eq66nEwF13OuOTIp1IPmKwizbjtosoM+RMHBNmBlWlx+hPAOcR3OhfJHmeOY2QwqOhh6gb6ne9/kWZSsNKSx6jMJxYoKWpbwue7OHn/aYHdwBhI8tUXpz+cucaAEvnjEaFwec8nNw2wo9RgTqe3RJZhueILcbT4bOY602QDFx3u0+Bjb4KGxeZ8UtnqBVezKybHuugZ5rgVVdSw/OrvZqL3uL1XwinjKfYxRUpGvc/BrYvSr2Mx8wuxoSt4Z65iyOrCE+39R2Ee+Ax4oCSXV2sqKvvdwO+J+a+hoXFBTwnnwbrFtM+mrWUATI3yTj+fQ6lRMSClp3LZeHwdpm4fv3MFvnNWDrqkoTzqdPy0YVD//lAc7LWA7qKX9a6W94bDel0e2aKWeaM8v5+xAvX5oMiBQKYNAlp61vl7vf4/DXjjPIvb2JXuxNZENraF7xJDS6kX+o+SYVNtc88Q+xwggO9dNuV8UeAXZbT7GL0Cbag/51H9rpomSwbgj/4IK4WtVvJKDbyD2bMqC6AK+Q1FtHBRiIVo9T959WhtpO6h7XKIFQx+ZgQrbMni2W+GRW9ZCWbs5AQIiGGp6vCZMJkyfL/jWQLl/nUj7pK90YlgJwYZtjhMbWpQOAUSbgrTixOvt2KS7jOulXSl3y2aapvqxXUgvJQ4oYaJkSyciXBgoiJEe7TCC6cpeiepkHiCQ7/WbBSxQ+cshNXWyzAdv5PQFV+QPfUcpVsHmBbtfbYnikNubXE3Bz2pZt2nOa6eBG3Cecya7dng==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 43e2be5b..7e91f7d6 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -310,8 +310,7 @@ "24,1": "0", "24,8": "0", "24,15": false, - "26,1": "工时分配模式", - "26,4": "*提交后不再支持修改！", + "26,1": "计划工时分配模式", "27,1": 4, "27,18": "如何选择", "29,1": "项目方案", @@ -368,7 +367,7 @@ "BtnText": "知道了" } ], - "ID": "0b6038d2-9175-4163-9e5e-64ffe1f1cfa3" + "ID": "d0faca20-2394-446d-86a1-7f3c14ba7eb4" }, { "CommandList": [ @@ -608,7 +607,7 @@ "ReloadData": true } ], - "ID": "4ad05379-1349-40d2-a221-6faead06159f" + "ID": "1f743334-dbfa-4fe3-925d-3beb69524268" }, { "CommandList": [ @@ -623,12 +622,12 @@ "BtnText": "知道了" } ], - "ID": "0304b0f6-17e0-468f-b906-e83989810266" + "ID": "089dc5ef-dfa0-4479-92a4-1ee6c27f0f12" } ] } ], - "ID": "35cbe3a4-06d9-4143-8044-05ccadb1c07f" + "ID": "1663ead4-acbc-4f9b-bcd3-bf454029467f" } ] } @@ -850,7 +849,7 @@ "Message": "图片生成耗时较久，将在后台生成，请稍后查看！" } ], - "ID": "76c6a44e-4f2f-4811-8c72-3c0f8a5d8805" + "ID": "2207359c-962a-45de-a69c-bd392197e53f" }, { "CommandList": [ @@ -860,7 +859,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "2d3ee9ce-d695-42bf-8b97-8adf8d86fb76" + "ID": "57d20d4a-797a-4af4-a888-f1bcec9a3f0f" } ] } @@ -1025,7 +1024,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "1a41fc90-0436-4557-9aba-c68f1a1471c2" + "ID": "b5f2df8e-8168-4ef9-a1af-be790705b1e9" } ] } @@ -1233,7 +1232,7 @@ ] } ], - "ID": "9c06079d-7a06-4f52-8843-b87505fc2046" + "ID": "918031f7-5fd0-4c29-ab22-999ba99ac928" } ] } @@ -2026,8 +2025,38 @@ "ColumnName": "分配方式", "GUID": "0d7f0e32-1037-4150-b9a8-5c8b2335f4b9" }, - "CommandList": [], - "ReadOnly": true + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "7ca33316-2153-4dac-811d-472754f61f1b" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": "中途修改计划工时分配方式，可能会导致预算超标，请悉知！", + "BtnText": "知道了" + } + ], + "ID": "a3489472-6f76-4d25-bb37-ead4e801b990" + } + ] + } + ] }, "DataValidationInfo": { "ShowInputMessageWhenCellIsSelected": false, @@ -2035,7 +2064,6 @@ "InputMessage": "分配到人：提前给每个人划分该任务总可用工时\r\n分配到天：提前给成员按天分配每日可用工时\r\n分配到任务：无需分配，所有成员共用任务计划工时" }, "RulesGuidList": [ - "20ab66f4-8f42-4a32-a499-e96087c93406", "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, @@ -2521,8 +2549,7 @@ "26,1": 0, "26,2": 0, "26,3": 0, - "26,4": 6, - "26,5": 0, + "26,5": 6, "26,6": 0, "26,7": 0, "26,8": 0, @@ -2727,7 +2754,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" }, - "Priority": 5, + "Priority": 4, "GUID": "cfda52e4-b004-454a-9650-2ee428efb4a1", "StyleInfo": { "Underline": null, @@ -2739,17 +2766,29 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ISBLANK(项目信息!项目ID)" + "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" }, - "Priority": 4, - "GUID": "20ab66f4-8f42-4a32-a499-e96087c93406", + "Priority": 5, + "GUID": "e5c38374-3f8b-4d92-bb91-171c1646bc94", "StyleInfo": { "Underline": null, "Strikethrough": null }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false + "IsDisabled": true + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" + }, + "Priority": 6, + "GUID": "48a495d0-ed7c-4527-8f9b-c98c9da0eddb", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", @@ -2813,34 +2852,6 @@ "IsDisabled": true, "IsInvisible": false, "IsReadOnly": true - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" - }, - "Priority": 5, - "GUID": "e5c38374-3f8b-4d92-bb91-171c1646bc94", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" - }, - "Priority": 5, - "GUID": "48a495d0-ed7c-4527-8f9b-c98c9da0eddb", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true } ] } @@ -2863,4 +2874,4 @@ "Formula": "项目信息!$B$19" } ] -}//UuYgiwR5PCG1QqF4o9SI6SlNLp9s5Y0r2dRAalX6iMzuiDkkkMFH2nHr9kvtLxvw9o/7Hpf/vs1OjCND077XxZIBn4VcXJNh69RUqwJPSR8dj+3MMVs4Is99++eS2ogIz5YE6sxh5g+shDBiOfSt0eFDt25P+87WcZ0j5pdNLmaX5RP0A+arLev9thFbeMO7//TWHNf8YOgOkNqBk4WRujtpHxFvpyPVOjQcKo7vSqpGLoB766+d2VpC3CTXiw4ri6dqr6TBNBsO5iOHSN8Iu9D0ThN/EAvJcKttlF7GJNFqwAFygqbUgfggoMdtFukivUpow6yzEKPJZ7eEit2RnZ3yNjV95HgvNO0d6PxfUbB+7zjU/+MWX/2W1e1ziywXhyvDq4M3/L4Ks0+L0NNnCsihzKUMUl/WMOVCmsrIzODKVsEa/PSV8bdgggauczz691J+jJozPOxZ9wY8hSvdnOyD7eC5n1v1cb5eufljAe80tc5I/ELM/ihIP+fZQdTHX/WvbIcUjtZ/gP6TJwqm7tgbMSqqLiJk2bnUSgVtRsandjMZkcn5LDEn1RzhSbHDTY8RVg1qrg1o4Bvl/YKn9WklwTVgWa+HAhtO+phNVMFZBSMquybNUGWMNmNrUC8y5+eAZbwjaA7zWcSCvyL9i0XPDM5OY9c+2aQtp7Owovu/X8cdHmvnNRFEYxe5agHHyR4d2sURmoFFnOIbRJ4DQu1udALCYGuxs9GoSUy9t6nLQeDc9gJ/0sFpURI1peDQ3MbjjNBR+kSyoqzQ2jO/yJlhk4jXPOM2oD4tHK5QZRa5jvjYS5L9T6ehafrPXeVLjAAdCH+28yihqF0gsdA4b3OoB6n/JcCbHTKw1txfkULQBNnBjGzKh8qQDHdc7WF9HkoZrVoLwO+D9Dy0ubICRw==|920 \ No newline at end of file +}//XkcXY4iPgSkAMTtur2rbnujuRESPJPSmWaVEScIyPo919YUDkZiBqCAiKlOj9M54/IX0o2ywcQ0Eg3VWcCJYRh2QCxADg8o4QD4mp4FfmwKcUAFW//yi3ylKdfFqW5AM0Gw4RA0MjKUITZm1x98UQsXqO8qO4tshD+yFkKOLahLplDl6yWpjd8DZGega7TGZNGu1nPlXvkTcQJbF+iY4Kzx+x+jlQNQBsaIH6EbQe7Jcyi6PheVCHCUNzO0zEUW2sfRjIDaJ0AgTymUj3pkT9995nVLelAe0aHnTJciNa36ekx1MRtumU1nMgN0AS+SrlxisJ1gd9xg2K8HB7nPvOVwC5Z8v5d+KcmrPSQly6hZ+xtDp+OHUB4T8Ch+YCux4dM81tfjv7vl046lPmfmd4e7nTWW6BLFYEEBopPyIlnSapqlFVW7fpE3QDW7W1WK5YinU/mFU40RuOvxVeQSkoYWtuZ7kgTbCUUwqcjEHbAJi1qoJqb4+3wfz0AZ16vDKzr4GOmu64rLrh2f9xLeTNzRlI+puMMlEoGjH/Q/eYN9c3OmBPe0BQr9FaG9jBJXeucsLIthqhP4dMs1AkzPRTFf4KutgOzvnbpUrK/FOO+WOtzpZag8c+3dFRsybiS9G1fjNgUHuQ2ZONiaUUdE72K8mFExyfKNWPPi5GZ6zntHLzSVQKThcFDfNqHMax1CFBTXf0G+AHpdn0ev8cS4nkxWcnqSUFrKA5bgRWzK7LlkqSoICFGtxE35xpznD8/jBMFrxBDMQYodERiBs6QnRw/CsNeVQ14ddOEWB/O7IcK6OMpWUicF32zYQhpcNteJVqF4kA8B6rKaL0PXUYDxc5e/I5dLKrd+CdJ55YataI0GWMrg11N6xEAmdtl8pFWOwVCoFQftOgU5C4AXXWaqR7A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 80548be3..3b630b4e 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -660,7 +660,7 @@ } } ], - "ID": "c6e01505-0281-430b-b04c-1714ea98292a" + "ID": "c7513714-820e-44d4-9c94-edd498c85f0d" }, { "CommandList": [ @@ -672,12 +672,12 @@ } } ], - "ID": "d06d4332-5a4c-46e1-9342-b3d74acfd2ca" + "ID": "150ce319-7850-4d6f-80b7-764f8c42fc65" } ] } ], - "ID": "bdbd5831-cd27-4b2e-a056-693c72b9efde" + "ID": "3e3a0538-89f7-4e5d-8775-2fe901aad4e6" } ] }, @@ -742,7 +742,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "191fd832-2e64-4578-b89e-14ca89a4d3ae" + "ID": "0f127183-1283-4ed7-b7b2-aea8958d9993" }, { "CommandList": [ @@ -757,12 +757,12 @@ "BtnText": "知道了" } ], - "ID": "e2b1391d-4c62-45f5-a9cf-836dccef71d5" + "ID": "a150a7c2-9a7e-48d2-9f13-cc03b6b8ce1f" } ] } ], - "ID": "1bc0eb2c-763d-44c7-81db-d688c610905c" + "ID": "084f22b1-a62d-411c-a59f-10a37ed8556d" }, { "CommandList": [ @@ -784,12 +784,12 @@ ] } ], - "ID": "9ac13698-7e6f-4cac-93ef-2b23b8d1d209" + "ID": "59ed428b-0d46-4206-a3a9-c5c34305e76f" } ] } ], - "ID": "ad51d8dc-3362-42b7-bc39-ca641f0e53ab" + "ID": "a029303b-2a3b-41b6-b699-bd2a8f1d67b3" }, { "CommandList": [ @@ -804,12 +804,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "4eb51f42-82c3-46b3-90eb-83af8f6bb1eb" + "ID": "459b2c36-8d02-48f9-a09f-a409fa2df3d6" } ] } ], - "ID": "cde3c3ce-7bf0-4709-8f7c-a53f7ccdf58a" + "ID": "976d8752-4ce4-4b5e-b853-cd4785ab2b46" }, { "CommandList": [ @@ -819,7 +819,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "00772d8d-1fb6-4f07-bb6e-703321f1b2b6" + "ID": "5bb6844a-5972-4514-9ffd-2496dcae9ff1" } ] } @@ -1001,7 +1001,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "207c9ece-9dc8-4323-9576-54aaacdf962d", + "GUID": "51173019-79f2-493f-a0d0-60ad05c7d2a3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -1010,7 +1010,7 @@ "ColumnName": "value" }, { - "GUID": "ea232d53-3826-4340-8fe9-afae094e10c4", + "GUID": "d8f4345d-61c4-4a4e-a657-31073e4bd745", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -1019,7 +1019,7 @@ "ColumnName": "parentValue" }, { - "GUID": "49599cd2-30e5-4b1b-b7c5-a3c738837be0", + "GUID": "da6daf67-94e8-43b6-9a46-8c9da0788563", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -1033,7 +1033,7 @@ "ColumnName": "状态" }, { - "GUID": "a75c5bc4-88a0-4808-a021-696408f5ed64", + "GUID": "72c707ec-e000-4a60-b27f-574edf7cabb0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -1042,7 +1042,7 @@ "ColumnName": "任务名称" }, { - "GUID": "7a9ae326-4159-4ab7-adec-30e81070f297", + "GUID": "0b741c9a-9577-4f67-a452-df318e9efcd3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -1055,7 +1055,7 @@ "ColumnName": "执行者" }, { - "GUID": "a7bcffb1-2bbc-48e4-9f00-fbbafb628aa3", + "GUID": "7879e744-2380-418d-b805-ce0557b6910f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -1064,7 +1064,7 @@ "ColumnName": "开始时间" }, { - "GUID": "d4ccd9ea-6e15-41c3-81db-da1b83038dac", + "GUID": "0875155a-d2ea-4335-b7d4-2eced47f79a3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -1073,7 +1073,7 @@ "ColumnName": "结束时间" }, { - "GUID": "1c3ac4f4-b8ad-4e75-b304-104b73af6a0a", + "GUID": "5a91da93-db4d-4d20-8a06-4b9dee509296", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -1082,7 +1082,7 @@ "ColumnName": "总计划" }, { - "GUID": "04a3baa1-7893-42c9-9221-236e7536de91", + "GUID": "b88e434c-5400-4680-84de-caab81d4e1ca", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务可核定工时", @@ -1091,7 +1091,7 @@ "ColumnName": "可核定工时" }, { - "GUID": "34be4c5b-70e5-4502-959d-ab03c3eb979b", + "GUID": "0a26ae51-9ecf-4e03-9f7f-54ffc0c8a048", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", @@ -1427,7 +1427,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "af6cdc05-1c8f-4c67-834c-5ed744dca1a1" + "ID": "694c8fa5-063f-4243-99a6-b2971df50349" }, { "CommandList": [ @@ -1437,12 +1437,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "79818966-8edf-4761-9394-b6e798a81162" + "ID": "129e1f5a-20a4-49a8-b422-aa1dfef108a8" } ] } ], - "ID": "dd9e0a6f-1f0c-449f-848f-fb53a1a0f6f9" + "ID": "be3c900e-6f2e-4f9d-926d-d6cf49c3306d" }, { "Condition": { @@ -1468,7 +1468,7 @@ } } ], - "ID": "ae0ec473-4e62-44e8-91ef-73cbb25e77c4" + "ID": "dc80b1fd-4b0a-4367-95eb-76d28b1f3fe6" }, { "CommandList": [ @@ -1507,12 +1507,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "38a83426-6bf5-46a2-aa8e-06fd8141fd8c" + "ID": "20a0a804-ed77-4e4f-abfd-54468654c60c" } ] } ], - "ID": "065fad13-9a90-4446-87f1-ce6be40a8a6e" + "ID": "e9ff0d4e-67ae-454a-a852-01335823f446" } ] } @@ -1932,4 +1932,4 @@ "Formula": "任务列表!$I$13" } ] -}//lAWM7baE717GSvWBh5E6AcNGK+BcECzw74CoWagnRWyZPGN/SQg8fUaKVOudIIG0GmMJdpmgCeewESkHj+bZMlh6bgntIfOQP5yJZEGbgGR31uqnlxQOQBomni9PvncwaqNZdXdypyvR9PmyvoOa0i5RAQtzZcmrRbz9hxgl0h2+YZc9EBk5cdy87OCjE7TpV58Z4aaDsI7quCF1dX7PiAMl2qktCJwozhDvPODe70c0IxEzWoWMqZW4B74e0mrSdGeqHc5ZrzzlXMtIQ8/oOU8aEwtTn15P2+L3GnPt45pED5hMlc1gacRqlIMcwmDJyFmBTMEOHdy3eNe7ZR4b/pHCBMA3Bv7RXUBjQRCdcAFIWRwAhHYyGWrkuiTyzWjI9dHhA0wi+wyq8Yrzvlm2IlbRrJYxRLlh5R+7qwa8/+ijgQjzGdUSz9ex8JVTh20KHh5rQ+84xH7shZsyyn3Dotc+BmtlNLs5YKZnst7gCNwvp4vKIOzbc34bA15wzClJd09qKkOqbQBM+MxDaRkonYd8lefAIjprHd/AseCe6j+mNSGXTQnt+uWKe9ecWb3MeH4AdqsRi5xV1ixZZV8qNonovvqrLG6XUZgFwhbLLlWg1Nu9CtVt/XdN0ZCMP2gGKGDK+cZCiQfh5tQarGHlqPMJfBbg4QUrvHdj94R9FYR37DOVJVSXfweCEDypuRutvNkTm0Fr2mSGTVVJEO2XWuP8kuxjpd3EWv4AFFqUsEhTE69bQImGVnmUf+bTD8LnL7JEqfixxWh+8xlz4JuuZa6S+Z3oRmKvZvvRdaE7UW2OegqQaLId1VZs/lue9iUk6CbOIjpX/is0/5qeWVr6CuDrU+t3hPuVk9ZxH1CSxZbaFmJGs0CSq+ylA4mZaK7CJjlqxHm5N0jkRMDwzzjhYA==|920 \ No newline at end of file +}//oCxLG6d6IDGnHXVEkhdC7jIhynxbsrEe776a0HiGrX8a9mrmapdWnyD6m8qIV2MF0Tdnq61gwUU6Ca2h2VnVd7ozm8vhedYBD6YOHvqvDUv9i9Dm31h0rpx9mAPZT2QSVaEdRRkX+x+grzR5Wgv/6DWxeCst8eAj2BdM8lP8K3pY1eEZBI6QSaEzul7/a8/NRfwwltIyS63EfickpDJL6wkC5oCuIQtST1nA5eoBCjzGXPh5YBSbptPYp0u9bfrIP7i3DepUH3vUez7wKy1Rhbdtz58B1nppjIPIIGXNsu4I1bhn6mcZznLMSFyJWhTbm8bacw4pojJtR4fIUlXzPOIutnrd5NiHa6EIOx+BxXolbe5FXVXCTgZw+pFUxt+l5muAAz2Q15DSi1v0IzximmxOIFRmB5nGT0Apz5kyR4mJ6iUtHzBMHS7jaLZoiRREqFtSf5VAkij3YEsAcE0dcOvjkwAMkXlH1PCNoeOjcS7ZdxRgxVwgUxCBaDmdw3ikOQlrzqnu2yY+7tx6ea/uxEokLzAduK7gTWEYnrgcjq9w0qXG+Ed45Oi2fWzhMkO7j47YCjo4ponBPwApClgblDCvCbM4P8xCvIEDrSFCV5hAZEsG0gKdQsicvV+uOyQWRkMa+2RzI9BEkHY2qmsWNAhEfGNuONn14abFFvDQn0Atc9g/CBQiVVXL2ENxNILHYbN2n6/qViUuZrqdk/jBkgkCidJihEyRuspFl1wjEod9rMAmaYk0jSAwGFVk8Zf+pxj4AnWKlC6pN+fSTbZHErbZFgBXEMPRzfDSqmIiceC1aH7ofjYDrgvfB6Pz3eNwm+88l1epXpgT0afyZ75+hbEVOOEJDAIqpu5ZWDSIZ3WRcJqvoQfy/0UqcEiP2Vo36zROpwVC+n8UySrdVbVDkw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index 16ba9989..af6b027d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -331,7 +331,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "88b409f6-8a88-4716-8c02-e96c48153440" + "ID": "c816ed86-fae5-4dba-afd6-ae474a5e0603" }, { "CommandList": [ @@ -370,12 +370,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "d6867e30-a389-4713-883b-861312022030" + "ID": "5573229b-0423-4ffb-be32-24c91b3066c2" } ] } ], - "ID": "876199da-7dbe-4309-a9c8-6fedfe63bf33" + "ID": "f43c3a87-8866-4f6a-a3ab-19d2880e1778" } ] } @@ -430,7 +430,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "8129a099-0289-4461-af82-0de48fd1aba1" + "ID": "a94f25ad-fb63-4bf7-98cb-20a848eb555a" }, { "CommandList": [ @@ -440,12 +440,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "f45e3c29-34a2-4c10-b0cc-3f3064b9bd03" + "ID": "12a51589-8b7b-4f6f-aeb8-74b4079a5bf3" } ] } ], - "ID": "44a7e011-f8e2-4856-892a-7e565c3a93a6" + "ID": "784f07b4-5351-4246-be75-6d0b03d924c6" }, { "CommandList": [ @@ -484,12 +484,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "f88e809e-1738-49bc-a8de-39f4dd4f3dca" + "ID": "e81881b8-a1b3-4905-9ae0-be5d4173d675" } ] } ], - "ID": "fbe3a622-5b98-4f26-b389-5b66d387d509" + "ID": "f79708ee-9b49-48b9-9c31-3b5fc5621873" } ] } @@ -542,7 +542,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "09e5753c-db1d-4aef-acb5-8f3e572007da" + "ID": "123abb73-21de-4533-ba59-ab6da2cf31c0" }, { "CommandList": [ @@ -581,12 +581,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "6a906a8a-efec-429e-8121-e1b1154877ad" + "ID": "cde83d34-85a3-4cea-85ec-fb29ec527a1b" } ] } ], - "ID": "3040d6ff-dee4-4295-9dbe-5996bc46a64e" + "ID": "1ef53d22-2981-4613-a13e-536283f98819" } ] } @@ -666,7 +666,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "224d48a7-b923-44dd-ab35-216ace292965" + "ID": "d9fe68a8-77d6-44a8-a0b8-542345491468" }, { "CommandList": [ @@ -676,12 +676,12 @@ "Message": "你尚未成为该任务参与人，不能报工！" } ], - "ID": "e3848fdb-acda-4400-ad4a-6137db428186" + "ID": "21f997e3-60ab-49ec-be84-535a228a5264" } ] } ], - "ID": "08dd25e0-eb7b-4780-898b-fddba17c5b76" + "ID": "653540d3-97e5-4770-ae01-62d4b7327813" }, { "CommandList": [ @@ -720,17 +720,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "7795f6e5-d4af-4091-82ff-9d08dc0320c6" + "ID": "311ebe45-3dce-47c6-9130-cdc863bcdecd" } ] } ], - "ID": "6834f18f-56ae-4987-93f4-40235b2c9a07" + "ID": "ef3b9d5a-04d6-42cd-85d2-bdcc98295a5c" } ] } ], - "ID": "1c91955a-a35e-45c2-b898-f6873a2f4970" + "ID": "fab2f2a3-0687-4d79-9e30-e107f1a3a6a0" }, { "CommandList": [ @@ -740,7 +740,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "0d714e45-8985-4a18-839e-5bfd74036b21" + "ID": "f1ba155a-7de6-4b60-a0a0-10a90be3db2c" } ] } @@ -985,7 +985,7 @@ ] } ], - "ID": "b26b9be1-94d3-47b8-b582-a9281e2296d7" + "ID": "611d5722-7605-43ae-ab72-523cf5f4f3e1" }, { "CommandList": [ @@ -1005,7 +1005,7 @@ ] } ], - "ID": "c9f601a9-35a4-4cd8-ac63-299fec552be3" + "ID": "d7e459fa-4a90-41e0-a75d-22c96bd761f5" } ] }, @@ -1041,7 +1041,7 @@ } } ], - "ID": "96c3ccdc-2018-4582-9b39-6690f2daa96e" + "ID": "2f0c6c7d-27e5-4b8f-921d-14ed3728a4d7" } ] } @@ -1298,7 +1298,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式<>4)" + "SerializeProperty": "='任务-工时'!任务状态码>=2" }, "Priority": 2, "GUID": "3f43eea5-2c34-4fc7-a4de-03e475465fec", @@ -1330,7 +1330,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式<>4,'任务-工时'!折叠工时详情)" + "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!折叠工时详情)" }, "GUID": "f0252303-f510-466d-ad62-b3d710deb5b4", "StyleInfo": { @@ -1412,4 +1412,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//Xvgjtqg/t2/yf66eP8o1v/8HncY1KM0XYtqZrKuBnZwmCJoVVSmWyfn28w9CYJHmv65neXs5NmRRIpLtnW0rGzLIF8vQ7LEic7PZeS9oL9qzup8kMLIa2jwdOECvoJhPoPGefu8T2XzGBET0eQdLFdrMG5aaed2Rfh0xbhVW3uIS8tBKYUxvgwsO0MDh8O9W15okx2tprDEv3vzYRb7p9kUNzVH8+6oforv0fFdCG/cwOvnVbiQbWsMwcabbQDRQSJ+nfOXkXOROHJ0WoIbOjmP6wa0Ojl5QX0UPtVuoevPcCQSNobWgT2y2l8RxyG0QThmDt5vsFVXZnEIOXyZ1Is2KQygMkbY8CkD2cVwIseXqVsZNSvQ1OZW5CWlTZK8LapLfOwoN4xgbHU//x0Uh5c9f3fCkvKNAhwpgx5o2CxPO28vU3t6Yo0VUugKC/bAcyHYP2YNUV3L+RXcnyATsShBdZftxvtgbdHrLEKpLpVsmW1bXm9o926icgskZoe6r98q3BoXBEy7rynrndC7PV9lfkwb95leCRrvENpJ9yIrydBN5exoZTsr/jIPSDx/sSXBKZ64y+QS7+XAvd4Cdekb7T8VLxBuaBigrcbx//ErNDYbFzkS4Hee3VuM7euGq8KXZxbyGuAn8R50gSuM5mX+jVTXNhzk46i7PexkhEPkOZvHtCTg2i3bcLvd0vhNrMGgUpO/TVVi1A1JxEhC8+vvfc1DDsX6WdIGO0O1Mm7TgV0JwimJ5Q7AkyocYCCjVkiV+t6PmlGTlbFbQzPBGGPp96Bt4CKH0IQzOUHSTCtNKNGR4elFZ5uRbIZmpAuRibGGzi7yUmakcjAJ9L0w0zBhhnzoIrK5DZgg1wqtBY0JshxA1roBxww2a9AdHclGHp0qTDMkQURbzW1ILB8mheg==|920 \ No newline at end of file +}//RhM5wARxMAab9z6MCAjd1DfiYXS2arfA2mAvlr/J2a5ynIsNA74SxZT5NlEg12HrTFx88EAhE0+0yI/ioBmkL8l6zBiAd3qCLSfsOrIb/6hlgRS0207h0li28pZcY33YAkt9wDLH1JvisxiwqIONKyR/xoO91hoS5Ooq+LFlm3EXKKKOo2RprMzv3wYehqLOfr+O5oHFqF+e+y4my/Nd54d7lJoh7WxZtI0eoCN5uptY5YkWS981yJP4qLCav8Z7F9BwCNgfTsfrmHDRRw0YHjIlEpXwl1A+Af/HNZ4a2U4/H2t4PN/pOhWzT//pvlrzCQy0dbj8gmcJq9rjDUWtJpsQARJKwWdN3GKs0UmXwyDv4l293t4wJS0HkOuHW7OTY4n9qOhhc6DAuAGR6tC4qCn3xSCiazzkSsXaM3QVPurR7D653brw5jGX3kBI5oUSuW2CBUzOY/QjhM41EbhIz4cWZuKpymQ2BI90HqGuqHidon3SgRKeKiLckSxWyUcGg5jNqBAARZen1WmAL6+79tplu/q6T7Li+sRFPKZlaourMSoci9+WN5MxTvBLMmZ5JHCH9XulRIdrM231XhHiVvlWS2TeKbfWozka9m/FaHdSHQ0r+w95eLdCHaSdsp7PRWmfX0hIgY5aMclukAwI9Xx5CdsQooUJ6SsNlcniAemgLTmy44gaUATjbXYXRukZv9S/L5tTJwFWOVdQ7cUPS/zELiy+Da4spZlBfrIS1wAnrbCrb+E/wa5x+kqidvil/by32F7ik3+VyX5uDY481T926mnUQerGGEUaDgkliE5RuwoVZ0hvzAr2Xy/YAjRt/yg8OIZoKnwOT7pTGt5H+DCvspN+3INQ5VnIn14vlQOl6jADY9PymJAI6xQeUnMPuHB/h0oo+r2SA/Z4RUvPTQ==|920 \ No newline at end of file diff --git a/Plugin/UI操作工具箱-9_0_6_0.zip b/Plugin/UI操作工具箱-9_0_103_0.zip similarity index 88% rename from Plugin/UI操作工具箱-9_0_6_0.zip rename to Plugin/UI操作工具箱-9_0_103_0.zip index ca568b6d1f428c96d0199fc8317a0a333021e59f..670738ac9251a3f7ba6d6c79982fb5ffa581edc0 100644 GIT binary patch delta 9398 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