From c1376556d3809b5108f48375662e31112221e0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 4 Jul 2024 09:58:22 +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/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E6=A6=82=E5=86=B5-=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE"},{"State":1,"Type":27,"Name":"ServerCommand?= =?UTF-8?q?Private/=E5=A1=AB=E5=85=85=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 49 +---------- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 ++-- .../项目首页/项目首页-容器页面/任务列表.json | 86 ++++++------------- .../项目首页-容器页面/项目概况-关键数据.json | 46 +++++----- .../项目首页/项目首页-容器页面/项目概况.json | 25 +++--- ServerCommands/项目/填充项目初始化数据.json | 20 ++--- 6 files changed, 85 insertions(+), 157 deletions(-) diff --git a/.collaboration b/.collaboration index 83b64a8c..92574142 100644 --- a/.collaboration +++ b/.collaboration @@ -542,33 +542,11 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:51:43.8299518+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:54:49.5953259+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -580,17 +558,7 @@ }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:53:10.9401466+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -1978,16 +1946,7 @@ }, { "ModuleName": "ServerCommandPrivate/填充项目初始化数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:34:21.2878558+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\填充项目初始化数据.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/项目表新增事件", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 6257f344..9f519d52 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "6525f5f3-1976-442e-8ee5-2e2b6f80ec1e" + "ID": "5fc145d7-f5c5-4727-8faa-f0c1dba76ac4" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "95934175-3b08-4457-95f3-df8eb511a256" + "ID": "a60eafc6-1d1a-451f-b9cd-c6d2e12f26b4" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "ff755b5d-5727-407b-88e6-f6a98d5d151a" + "ID": "602d73c2-84c2-4039-b721-4681374e285a" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "f6050abc-1ca7-4703-8bcf-56c89e2e1561" + "ID": "243050cd-8f72-49e5-b143-9d369a8ff20b" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "2706da8f-13a6-4834-94ed-f573536f4b85" + "ID": "91557df4-5314-4b76-a743-de34d1fea878" } ] } ], - "ID": "d05065ca-d802-4b06-a02f-020ea0dff2ba" + "ID": "96e0d544-4ce7-49a5-9a60-0b229e8313e8" } ] } ], - "ID": "e3b08bba-4285-4d01-9d2e-c6a171d08a4f" + "ID": "c0c93e21-6a44-4f1a-b4a8-246bd4bd1bda" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//SIR4o/fV35vwuGO/oH2ZcPgXxGcLX1KUbJoeTlJV8OWNldBjeFX4oECobwbI/ZrMJiDb5cZtO7/E27UV7+mw5YFqPHWIsIRBnP3iKCam6yjyNNul0Sc46KREujar3hBP1pcsvzrYnZ969C0n0mfFzkRMhpBJie5bOGGJn9Prtr94zj3INeRl98S1GU0a87c5NjfM9RRIhNGhbwVDGJy2cQh7323tl5CzwepOonM/h4bJg49FB5qE14Y30JLxHRlRbVyl7sZ2P93o9gboEBxwbbhtQVTuSIqqPbtrItEvh3zCZ55MLwmWmhZ5JevlFcNnuSDYL+Ayo9jY8Zwm93E0cxe+gHv3zMDyrf4i18DcytxutFJlHEalrkI4sznqO+4bKHeSpFIT2YYJ2IQBSSqX9ILIVdeJ/f1TIwHOx8V6iunYbr+GnKtkSp+RWv1VaKIin1d1GJrKOnpjR4oJxlEXai9+RSUMBCMSFJNCC/A6MGe+2k4IEMIuyjAlfOL8d71lsPBqx8HKk9+e+vdfD2IeSqY8weuUEQCcx2HHWF+s0PuBYkfw7QDQoDWXzjavfcwbvWc1F/DatTMGkuQ2l1wBYu1lFKL8ECfpYBSqeFQ2fXa6WUA2mvFJWLapAA7vcADNfTyRpICbjYIpYniMMWYMm0UxATMKR20bEVAqIjghXaAJdXvGN4RLJFbVsw1hGKdFfmfuYq6bJ+nmuMFuYinzFGhSPtGtfcgcXfOjiFGq7pVVc4ygHg8opbvYEF8LXzJqMUY6H3wW3U0W+RHSyWsSpE0seaux/E/aD0pgXdiB9xXeO8EYavkp1fn0bE3tHcNtq8lxKE0hG0t6cVWkrOlELgGAZwYNb0Z6/zumiNlWgblfwLcj3iv/BA6+dYxfZEo8rNUXaZYsfe/+ZRlXPW9vTA==|920 \ No newline at end of file +}//Hjf/xVfhxoPxg+EfUeqggTffHicu0FAOXAySxjiyTj6ysD3tRtbDy5Vd7QrqWYX19CLIZQqR/0+KfNPy7PgK8nW8Wzz5dEk69ykP/69AhQIHu97teDqsUrDdReYmwZ2fckPdR+OYFaXF2cgW/W2ksNivYMuqDQODQ9W/ZvodA0sybmel8SmptRmXH3+KfG9zXWUeMB8Zg8JA7abYHfcEU3VusEasOxQGKGmfGWMQnTU70TiPuc002tOCwgctlZB/1SZhG575BFdG7qCq58Go4q2EdUDOcJ3NPnTLgbII9w748Fdh32CqfLFKUZBjT9cLelBXvapW+phG8u9cOfh/4ROaVH88r5KtrEaL0BJ9vqTvIa7GqSq4h5ftVknrr5okm15pSXIxtYqmfYxN1KmblCPvUr+ruy1Vf151tOurGuHam6uJdRmF5isfnwakoSHFPs71h0uZ45WypJ9Qoc5NwxGnjEA4wL6xFHFFMPznIWjPpTjKwq9uEScnCRY9s0V12hqFQMLQx+C6y6GAJ3sf7kiVPkggw1ae2HKA9BwLHWJ2UNdGtytgmkZbGkL6LJBLVH+Q3KY8Q3kDMCxDVo16BtgYXNXxKny6zXQfx/1r76AxcY8ShHDFstrc8Aoj9f+NWBpvp+ieIeMr/1wUsdyNUBa6xXIZi8p+nsxH5Mb/K6K/D1rykiu1ayxy9IVZ5FX7eYwIyl8eR+Z4Ai26GjNDYVpiblypi1aeUrzPJAeoSzNEQwwoW9iuS23H7oCJF8VEgrcF22M156wfmU7zCbHfnPSwb5FPGS5biyRJVd5EpxOuUGWQaaovDSyHvVziaeg1GliF73hlfEiqboziZ9nMRmOXRhjRNlyX26xT7vVPARQ79sLPuKsVM2MvcMO46Rik6D+G4fgnL9+BBDZYr5/m9A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index cf8767a7..40cbca41 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -467,47 +467,6 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "项目岗位数", - "GUID": "752ed267-7f19-4966-8a4e-7d743cd71966" - } - }, - "value": "0" - }, - "CommandList": [], - "ID": "b72643c7-2919-4f16-bfd1-6c1beb58d436" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "项目成员数", - "GUID": "a6c2c184-9d63-4938-a123-5e51d1c4f84d" - } - }, - "value": "0" - }, - "CommandList": [], - "ID": "1bd08fcc-1768-4e65-9546-29469e0331cd" - }, - { - "CommandList": [], - "ID": "adf044a6-a226-421c-a070-f4c230c26abf" - } - ] - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -702,7 +661,7 @@ } } ], - "ID": "b5c83930-3ca3-48e4-b24f-cc4d572873ab" + "ID": "16d9cd56-4ed7-44ff-ab24-dac44187cfc7" }, { "CommandList": [ @@ -714,12 +673,12 @@ } } ], - "ID": "930f5ab9-0d35-47e4-be5d-02507a79bfe6" + "ID": "4f7651c8-faa5-443f-b051-6067bc76d711" } ] } ], - "ID": "115e9bd4-00be-421a-8df9-a4458bcdaf78" + "ID": "e0fd4dc4-059c-42ef-8cb6-7e935d8751ff" } ] }, @@ -738,6 +697,15 @@ } } }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!任务EL表格" + }, + "TargetType": "ElementUI.VirtualizedTableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable" + }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -775,7 +743,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "f5a6514f-0579-4ad3-a740-ed2de15d4089" + "ID": "64cbd54e-36c4-4afb-9672-603b231ba3a9" }, { "CommandList": [ @@ -790,12 +758,12 @@ "BtnText": "知道了" } ], - "ID": "5e22974a-7779-411f-bf59-62dafda7cbff" + "ID": "104ff0ab-7ed9-422d-ac62-c333172af633" } ] } ], - "ID": "3418f47a-75d5-409a-9658-e3b613a3dcad" + "ID": "2ca0732b-811e-4db6-866d-2634d27afe66" }, { "CommandList": [ @@ -817,12 +785,12 @@ ] } ], - "ID": "e0c32092-83d9-424c-a814-bb5416868b13" + "ID": "ddeb466f-c161-499e-aba8-2af21a83cc6c" } ] } ], - "ID": "7f07f825-1e32-4ecf-8dc2-5efa34a26f36" + "ID": "dbf6bc6f-a34f-4a7b-a791-2efb9b0411b9" }, { "CommandList": [ @@ -837,12 +805,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "696bd83d-5807-4abb-9b73-f0808ac48309" + "ID": "070f6227-f611-4370-9865-eb5b359b3c2c" } ] } ], - "ID": "7b90a11f-f2eb-446a-aa56-e756bcc12080" + "ID": "4d6bdc17-2f7b-4bb2-a2c8-3da5eacd5d2a" }, { "CommandList": [ @@ -852,7 +820,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "ab9c6942-3c5e-4f97-9a36-4967a370bc78" + "ID": "86188c5d-bd50-4976-88cd-34baab6708f6" } ] } @@ -1400,7 +1368,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "93aa4648-7675-484d-96e0-ffff158849d4" + "ID": "e976c0fa-448e-42b8-8d81-888adccac7f9" }, { "CommandList": [ @@ -1410,12 +1378,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "0fc88b19-80de-43d2-9408-fb776576b957" + "ID": "4805a7b4-3b0c-45e9-a890-0dc80931fc0a" } ] } ], - "ID": "b7477efb-c7fe-4921-8503-037407c48654" + "ID": "29be9ea2-0ad8-492a-9679-4fa96ce87a4a" }, { "Condition": { @@ -1441,7 +1409,7 @@ } } ], - "ID": "b6e3679d-9d13-4a6b-9e13-c758e2053299" + "ID": "e5c4f532-3419-4049-8a80-3e8be671b4d4" }, { "CommandList": [ @@ -1480,12 +1448,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "15d9be64-dea8-40a0-aeec-f1d01e0004a2" + "ID": "6ded6367-3ab6-48d2-9aaa-ae91a25c41aa" } ] } ], - "ID": "5aaad183-be62-491f-b7c2-b7cf4f84cd48" + "ID": "f431a61c-9808-46d3-89ed-51858cfb672c" } ] } @@ -1954,4 +1922,4 @@ "Formula": "任务列表!$I$13" } ] -}//7OmvDHJqtUesF2VXJU32kdIPaCnQHqSsEvDeVQu+lEPCpW1AHKq4xSn261F75K/AY67IKOIL22L0XuOKyPk8jL43iFDqLl3fjJS9VXac9feIg9F5E1amJ1JMv1fN77mIfAxt/KkVVkPxhG0wATZ8O3qnHjwnq349i3+yrBhE4p8fEeeF9RfyQ0Xr7rNM3q0idDYnZp9ug3UU1hBISIwBEyoLblkdzPj5IfuwN92drQUNs71JPGsqcEClVaELtV3ojLV97DKFnLp8KGRn2rahBhqAvoGs/waUug/KlOBJqkG6qbdnyCYpL7hkn4LxD1icpP9NkwUp9GLdE+5WCIkEknE5TS2YChAZjiSCREqpRfLeu6ZUUlYZzEsmUm74TRM6ZCet4mQF6OGPsZ5SrhQMJ7ivir7g+zSX41PedxYL2ICiw3jKV6qtFq7POcZi54K2iX7JeMYXHatjuZWaTNqqgWcbHjGtSdIrohYEaaPoEmyBEJsy1XbDDgQA4Mb5dj7Okm0j7OvAMI8rNxD5+717DFBG7GdYtgSrPnIDg+b6VaeWETIHQHfqY2OGNXLQE1Oy+vx2Yg4yq6WrOBYXv5H/XshCZuNyR1xhJfC6Rlbkyj/MIaUBmyVFWJd/JmbXp49kIFkJBBDjRFf6VR8Zfe8BTHF9lbbv9mE3RzG6ejJuiUsX64xa7hxbNxAU5ZKegc1GLvsc2m1oGVc2KqqL5vdyX1b2PupzPo3kaDeEJf7jOyG0ht/wt+/oX9xBuTKdibpMA5swXdrylyDFVvyAmC0OrMzt/EmKYpjmDrZojOQ2TJOYPLvdNihcUvtgpwSHBPie7KsJOiNPA0/RCdvEwMU0DOloCLWP29iurKqkPOFaKGcmOPXpgeQWtTdSxXoKcf5iy6VSNc1Y5c2EkaA8+7umPQ==|920 \ No newline at end of file +}//fcYXKp3wBgk2/799CUZNGiDJ2UQcUQJckFDKbuWCDTl/lTn1WPA5CdOQA4X5AmDGCysl26GjDKBHmW5uj5BbLN4Q0S4Vx+dxmN4FGG00Hlzs0o9L9sf//1ah4FHl/71jxGnfRsZWUsM57x6wGKvKncDD424oI0QRUlUy6qEttG6sjghArxlryq/4eJsiFw6eIXBsj7YrR0CH5TedWvDXCh1aau8UsoOxqCa7Br7phGC6aChVhPOR0+R+Va86nBFmGYMpM01J2Lfxvez1cki0T6FBGb/58ElclyOdw1J+xaDaFCiwTwtCRL1Y8fB53MCgiFYrbsx7QQIj45gMnBkZ6SoPutXxpkt5McCwnCLFXphGO67qjdQYbymwyIG+/WP/KUI7TIWdn1F7LoK4V2hknsDeDNv5JS/dVPIBYdroD0Y5UhZ9fpTqXnlB9De69FdQDhxbI36aPyfkkSA6wCZdt7AFV+zr0W0EJx4cZS9Ys6NIzPiOWZF1iBuwypv31E0NZZfxrbNHeMRWptWbEz5yK9bgP3zZFRiEyZwciUbAJb/0UFAHgsqeQOjY+P54AgjI2lLAL3pVFcE21nqt7XYhipXYM2EHh6zAje1P2FFIie7pRy9ZhqPDTrnLwo5iIikxykaeIyCq8FTfuI2ACSjgmDT3oLcNaotFEWzPggInELL/pPfU345A4N50dbmJM5PqTyNVdSCki8xDUImJvf72U2h8SzbByteRuZMIGTxOHYHHt4K1UEB/0qiZokkNubsu+AR0qadYN5twYF25x/rMjlotQK6Vuk8ZDRnDRTcpRHLlxQm+5WazKf6CjllLJV0iscZi17iT/7K3Vwu6CJ+Ub9zKBwWHPDWhofmwvESipoQQpzfKy3UHNxqlNZOx3EgPTPhex9zpZ0zfzMSb9qfn8Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index f199a7d8..d31700f4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -291,7 +291,7 @@ } } ], - "ID": "e303e51d-de10-41d5-8b20-601a253b655c" + "ID": "45bab75b-efda-4dac-bace-407c67790b81" } ] } @@ -336,7 +336,7 @@ } } ], - "ID": "fc7b654e-5a2f-49f3-8b38-6bcc8c5614ac" + "ID": "b0c03ad4-5c47-4ac2-81dd-3457a1d8b827" } ] } @@ -381,7 +381,7 @@ } } ], - "ID": "6c4e1384-fd57-4d4b-b7ce-735ad4bf706e" + "ID": "1301c3e4-388e-4c34-934c-65951672916d" } ] } @@ -426,7 +426,7 @@ } } ], - "ID": "d062efe9-03f8-4e10-bd9d-8ba7672d8459" + "ID": "066937c4-5579-4c9f-a481-3962b36b092b" } ] } @@ -471,7 +471,7 @@ } } ], - "ID": "e466bb7e-b288-4375-aee1-b4f764d88b26" + "ID": "5b3a3465-54b4-45e3-afee-156f861208a0" } ] } @@ -516,7 +516,7 @@ } } ], - "ID": "2a48f016-1e46-40c9-99ec-eba65c417778" + "ID": "5164bb4b-4a2e-473a-aab9-e57850dd3d8e" } ] } @@ -561,7 +561,7 @@ } } ], - "ID": "a82b408d-c69a-4846-b131-8d49bfa36385" + "ID": "422216ae-ad0f-40bf-bf9a-1f58e5935f59" } ] } @@ -606,7 +606,7 @@ } } ], - "ID": "6dc59512-740c-4670-a496-0a9c0f2b7428" + "ID": "0c1d074a-d165-43be-aaf2-f18ff19fe0b9" } ] } @@ -689,7 +689,8 @@ "FontSize": 12.0 }, { - "Foreground": 2 + "Foreground": 2, + "HorizontalAlignment": 3 }, { "FontFamily": 0, @@ -714,24 +715,24 @@ }, { "FontSize": 18.666666666666664, - "HorizontalAlignment": 5 + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "Formatter": 5, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "HorizontalAlignment": 3 }, { "FontFamily": 0, "FontSize": 18.666666666666664, "Formatter": 6, "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 18.666666666666664, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 18.666666666666664, - "Formatter": 7, - "HorizontalAlignment": 3 } ], "Types": { @@ -741,7 +742,6 @@ "Text 1 50", "Center", "[AUTO]General", - "Left", "0.0\"h\"", " ¥#,##0; ¥-#,##0" ] @@ -1092,4 +1092,4 @@ "Size": "130,181" } ] -}//y5Tn3/N5B1xD7BMTG7++9MGQB+FDueCyrVdhm1il9j/BzzpDUNc8vOkiU/fPochBU5JDAi+nBVBhrDpXjWyCH2voctDiq9Fe0ghd0TAEowhgoEQGKzKaqDAHNwCHAoiHDanaWkych2XPXQf+h0dau5rW1J5Q4U3IzSYhZTUfpoy/lgq9C0Aa5G2rb8TuSdRoqV/U8KqTI/BqlhG7HrHINnWFPsxnWs5TBC0qRudN2rDnr9CV8Yd6PPEmAKb8EbYxggazKf5DPar8pvuOMcsRnyeymXPRVodZwL003cC+xLPHdGQ+XrGBsOY0qeQ9TerHC+NelPGHPpuUOoCteF2Egw/AWB9tn6cDYgdhF99x65tb4LiuXqi7oRN/oD1dap/RssVGhE4Mb7Pcp4g6bTaDhulGBJVqFGwiWcjMIvqLQlDNRK2+Z8XDAbJq4X9rlHPp0Fn1dlbomP7ti+nb/U/6obvFmj+NdECbTc6bpsnKSvSsHVP4PudycYZfWMyYJ5f4tiPrKxi0d+ssF6iU2/Y9orOIAjS+Oec0qAq8c9ZtkhtKMeV7yDh2cJ0s+rcN3yqi54nCjf4tFus+R+jAiAZLA1lmAZ4VAJBbfgvAJYbDqSZT86Mt16payug0tXpDXSQHQumg05XEzyGHxCo5ofEjbCPGxR1NhOV7eztRTD3M09oCVXwYU/fJszVJAo7D9yE0U7aJOFWset/BRrFso4kppSorpT0LKbN43ed0f6XvxnxXuSYWgeetX2mGjUmyWi+rLyY9JnktD8XvHuHubRidZq9NaMLsRq6tUKkKG8dHImNypWUq6LHwfVkcKvGx7LihNohsQupkauC2GOkc3RaQ1vlk7NF83I3Lj0Oj5IXMqLQoXtp/UdZjObeQZTboudIoPU+g1qCjj5OUew+bsZkuNQ==|920 \ No newline at end of file +}//SkDIQ6H0qV4QD4n9ofqUhae2xA9EYjF4ZCE+0t7Wz7c3cV9dCJqvgWAzIhy/JMgObRtjFiiERAcg/9aw8ATWVIBgEUEkMSA1/Cglh1kwIfI71mPc5ou0VS5vhwYJwjj5Kyg4c5AcbiKFhxQFsIOoeRtIePsiOxVO1omzLasSgdUkr6SVlzhAg4NyumUlz7+yqbiKJLlI7VYGKPbE6GJKuLSJp2HRgsYncMCW7FRt55fCEDSlCvxejiudzBOJJc2o/k0Dlj4LLQygi9aWtN7MxYCAn8gxg1bQ9dW5M06VikO7qNindyS3SeHvvNxRK3ehmuyaVyb+U+qnJqRJnxN6St6EyJ8Ez5nfldMPiET6fSbHhe1tKD4Fkga/CEa9omy3TLjBXlzxIyyU13Cxt1JeWPtA0093s+wWv45Y/Tqdev58EoRgjbKxOgzCNtnezRf4lL/xJ5dTb4N9PicEAdQ/2CmMFnq9Www5j4S38MQkEMt14k2gT45p2qfp5R2SFYSNcslvLnC4y8OOa6BxXibYZGq7USIlzTAh4ZskwHeOsy+I9PPjmg3zp97kuSd0VDYR4LMvkKpj/CgZeeL+HlEudK83WIDKIOt8x+80jl/PI5YPk3bVMxeVV75GBPrb7Xsm2k0LjS1mZIOCmZaYlFOEGUfWJps7KqSB+dfBjBurfLj5LHd9rEqJhhMUR43ZQvTmd+U9C2syuntXjS4O8oGbkKc4bvA/aMwe1bVlGJ+w96Yj4Lyw3Zz+i6V+mSKXeYic+4aUVCPJQykAOOISWPy9jJOCe4Kjyxx9YM/mYl2ThgnwwrgMpL+yzWnfMYvEpax5lc3clh4wY9wu3j21fBC2mK5YHA043AV+nGTz5voDMMJDdLNslJspHwVjvAmQx30awF0B8v5UiDP+DoFfB/gBWw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index a02e9aa6..a044d4a8 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -398,8 +398,8 @@ "GUID": "895cd2ec-16b8-4f51-b109-144638c37bdc", "BindingInfo": { "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "f743346b-9d46-4fd1-ac9d-3afd84f0df20" + "ColumnName": "总工时", + "GUID": "7e7af8c0-b690-4b23-a73f-658bcacc829a" }, "ColumnName": "工时" } @@ -409,27 +409,28 @@ "SubConditions": [ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 1, "ColumnBindingInfo": { "TableName": "任务工时表", - "ColumnName": "FGC_CreateDate", - "GUID": "ff1ec5e7-5922-4965-92e6-c91711b1760a" + "ColumnName": "项目ID", + "GUID": "e36feea1-22a2-40b3-84d1-8f0ca6938e5c" }, - "Value": "%Null%" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目概况!项目ID" + } }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 2, "ColumnBindingInfo": { "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "a15fb509-d69f-4ece-9402-02f534eec4b5" + "ColumnName": "工时类型", + "GUID": "9580bd5c-5a43-4071-94c3-1236badfbeba" }, - "Value": "0" + "Value": "实际" } ] }, - "NullFormulaValueQueryPolicy": 1, + "NullFormulaValueQueryPolicy": 2, "OrderBySqlCondition": { "OrderByColumns": [ { @@ -717,4 +718,4 @@ "Formula": "项目概况!$AH$2" } ] -}//I8h1t4l6UhiR6g4X71//r7yFL0AxdT4syZ+cAEJmUw/ImDQgcvZL/sxvSPuTQLM49yc+OAhAqHy1TZFX6e+FSmHS9wNAwKXr7GiLvtTaQ9YRXr1HFKAZ4DId7BSLe7h15OdB2rSEANm14lb/KCVAyIa+ettgD43HmoZwj7XPocr9vmurC7MMb6ZBSO50RLUdNWAcYQGZCkEwSBmIc+EVp+D1hV5DcGlM97LCGhvwNQZ7ymPDOrXFfSfknkgUW+ybO7z7L0X+38N1/dHXxyvBHyKsRYUDZOmGHUYz4v0k4ckMUwKStoHMTbzBoSE5QmY0ZJkWx3UXbbKbEZ4aXc2G/9CkcMJHDFvYXtY5TFbKEJ8FdwfHF4uMQQpPh8vnV12uAJcGvcPbH9+7LBEixKADXf/nG6ah5Bp5qLISwi4DsFVPKNgYEJDyx+108BQtxXvNDD8KRQoKUCyx/qhSpGNjmU8byd6yWdqr/peHGUQj7Glxv0LutSGBZjQ4v/NvV3Tm6euMLLuEMIegmsTCoctVFfH+ox6/m35npAK3WP0NuN0mC8EI2E4UqEQ9bp8ti3eRqatcw2q/UJeJZjA0zfHFivnlqH0UbQmMfvQuwHEow4BQbtvUGEqm7KD9fUqXJC3wAyuvoaMdrflPdY3xri2nxjtPFLGdXABX1JEUXCu3kMb+ziDRT4jGyX1jC7Q2Xy14RWDmFT61kjAxhw8zAiVsrrZXRl7EaiVl3mAkTLq8XkKVDkFIiPj3lsgz84VRGhhRp2hq/dGdRArhFXChEiDKwZnwbUlK9bKBWtrwu221yAmstXW4RhdaE5Bfg5Snvfx754JznCbsePMZ6FUx7T0hwuiwHYRpPy6nS4NcdscndjdZRCE+FZMZGVUR0bfy2LmIxWdjwjt00sJvt1trWS39ug==|920 \ No newline at end of file +}//HHYz+4WViQRwBOPT6QkUAEPWMZEKB8+KKNANMpMdXVdFo13Z9Fp0W7KiSzylRt8e8GsGT3jvohDMSTsahg4M3oLycQrhs5kspxEH70RKFXDVqzxFMUaJFYurSYrLcUAYOKkLwFH1KiSKLLodFuNWZSYGiOk9dlewVVVYeiqqIdveMswhH9xitF52XhNr6cXZEi9ludfKexn0dSORaWJ4GhdH0kTEZ30wvrlUy7p5M/8hHfCvH3Dp+pctaoghZOj9g5oZ8qtEHljIpRjkxk2ZDqKM8X78Pt+Wph7yhfUxXLWkn1uxwlpXHZrJeJzWjkFEZbSlrAaugV3R4wziLoL6Hu5GvLC6cN1/o9dx4VnLyi+6H3ySClBB8pUQrCnfTSkM5CESKvOSRfg9DAJ5F7zhuiKPy5p9eMHVcMUGDh0vrxnf0lTQUVl4MWg1/8xzf/jX7jcqhgyid/abphJCe2ZCoPc0yvwW+nbnmyU+NIAittjolI8Wka3ap7EbULxcUljLYWOinGZkgj5FrfGqHMtEB5WC6qq8+NZ18T3YlbxgdFgwr27PDX2Nb432KpMWaJfLbgfVSkusVLLZxxwL1BajZfWoufG7AGwFIpzNJl69NfOXPpZALIVALNdW/sGgSIXjFykV6dUUfnWx8iMFCa0ajwv5zsAN5z1jPbuZpcMRUxOPC1BdJN9bqs/rNE7LXL4mIMloryGFpwG771IMQ5xACQVqugO/2lyk5T7iBId8Bv/YGCpGbWo/RY5shl+BhkrOo01MZYuoFU7zIsOhbIEazrJ0M0xxPMQs/ILG4ZXqSgDoFih12hxHk9XB/HD/wnpZS6cbZzNLJjRb/0xe+6xN1oFg3dKQaD4XKGKVH5ULd2Y2XfVOU9gzPzr+LopVJSV+59YjX4UEDeoANk+Uh2+81w==|920 \ No newline at end of file diff --git a/ServerCommands/项目/填充项目初始化数据.json b/ServerCommands/项目/填充项目初始化数据.json index 7c286317..5ec24d4d 100644 --- a/ServerCommands/项目/填充项目初始化数据.json +++ b/ServerCommands/项目/填充项目初始化数据.json @@ -328,7 +328,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "1c544125-fa9d-4f1f-9cef-29f5f84eec6b" + "ID": "b335ad2f-ed69-4567-9046-648b20904236" } ], "Disabled": true @@ -484,7 +484,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "baebb602-4a77-4f0d-84cd-fdac647c19c1" + "ID": "94d0df70-c19d-4a7a-9789-317d17bc3864" } ], "Disabled": true @@ -637,7 +637,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "070eec14-8ca8-45d5-a727-19d890ba17c9" + "ID": "a03f8200-a5e7-4bc8-a9a6-95026d5f7dba" } ], "Disabled": true @@ -790,12 +790,12 @@ "Disabled": true } ], - "ID": "19f3178b-c214-4f60-821b-dbf1c667997c" + "ID": "751f70f5-cac0-448d-842e-3c083179103b" } ] } ], - "ID": "7d520a04-65b1-41fe-b8af-3b253e44b8e5" + "ID": "ff3bd31a-b58b-4a80-a7f6-bdf56a6bc40b" }, { "CommandList": [ @@ -805,7 +805,7 @@ "Message": "请先配置项目客户及客户对接人" } ], - "ID": "27172122-a8d4-463c-8694-45a8619be24a" + "ID": "fd2fc316-3afb-4894-bc01-dd40f0f712f7" } ], "Comments": "这里对岗位进行逐一判断，没有就加上" @@ -1021,7 +1021,7 @@ ] } ], - "ID": "3995a844-c7e7-4ed9-b767-0937b9a973e9" + "ID": "676447b8-24ac-4d4f-8666-bb56efc7ee7b" } ], "Comments": "这里填充默认的四种任务分组" @@ -1032,7 +1032,7 @@ "Message": "已完成" } ], - "ID": "18d08939-6833-4410-8c1f-f0d54251b9df" + "ID": "12378146-57ed-48b9-b24d-bf9b791ffd48" }, { "CommandList": [ @@ -1042,12 +1042,12 @@ "Message": "请先设置项目经理" } ], - "ID": "25c68d3c-00c5-472b-a8a8-0018862b61e4" + "ID": "5a08da03-9029-458e-b3f3-924f41c87591" } ] } ], - "ID": "366808b2-5424-45f5-bfd9-8955a1e56a8d" + "ID": "d99a8054-9503-4584-9354-e49530c415d4" } ] }