From 05692d741bc06b2f4eccbc5f544af26ace79624c Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Sat, 2 Mar 2024 23:08:42 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=B7=A5=E6=97=B6=E8=A1=A8","MessageType":2,"Modules"?= =?UTF-8?q?:[{"State":1,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E8=A1=A8?= =?UTF-8?q?"},{"State":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"T?= =?UTF-8?q?ype":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=97=B6"},{"State":3,"Ty?= =?UTF-8?q?pe":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=B7=A5=E6=97=B6"}],"V?= =?UTF-8?q?ersion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 83 +- Pages/57e644c056074f9d885f24a5bd7b4ae.json | 144 ++++ Pages/任务/工时/新增报工.json | 18 +- Pages/项目首页/子页面/任务列表.json | 64 +- Pages/项目首页/项目工时.json | 920 +++++++++++++++++++++ Pages/项目首页/项目标题.json | 23 +- ServerCommands/工时/新增工时.json | 178 ++-- Tables/字典表/任务类型.json | 7 + Tables/工时/任务工时表.json | 26 + Tables/项目任务/项目表.json | 6 +- 10 files changed, 1290 insertions(+), 179 deletions(-) create mode 100644 Pages/57e644c056074f9d885f24a5bd7b4ae.json create mode 100644 Pages/项目首页/项目工时.json diff --git a/.collaboration b/.collaboration index 700a73d5..c53cb1fc 100644 --- a/.collaboration +++ b/.collaboration @@ -17,16 +17,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T22:57:34.8573466+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务表", @@ -34,16 +25,7 @@ }, { "ModuleName": "Table/任务类型", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:45:19.6644435+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\字典表\\任务类型.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务状态", @@ -159,16 +141,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:55:29.2798769+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目首页/子页面", @@ -176,16 +149,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:57:48.4981968+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\子页面\\任务列表.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -394,16 +358,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:50:10.2036869+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "PCPage/工时详情", @@ -431,16 +386,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T22:49:34.0618948+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommands/工时", @@ -448,16 +394,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T22:57:34.8577007+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", @@ -666,12 +603,6 @@ }, { "ModuleName": "PCPage/项目工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T22:57:34.8576032+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/57e644c056074f9d885f24a5bd7b4ae.json b/Pages/57e644c056074f9d885f24a5bd7b4ae.json new file mode 100644 index 00000000..1077e4fc --- /dev/null +++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.json @@ -0,0 +1,144 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 26.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 6, + "DefaultSize": 10.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 14 + }, + "Values": { + "1,1": "执行人", + "1,8": 0, + "3,1": 0, + "4,1": 0 + }, + "AttachInfos": { + "1,1": { + "TemplateCellSource": "执行人姓名" + }, + "1,8": { + "TemplateCellSource": "总提成" + }, + "3,1": { + "TemplateCellSource": "总工时" + }, + "4,1": { + "TemplateCellSource": "平均时薪" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "FontSize": 16.0, + "Foreground": 0, + "Formatter": 1 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 4 + }, + { + "FontFamily": 5, + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 6, + "HorizontalAlignment": 4 + } + ], + "Types": { + "Strs": [ + "#FFFF0000", + "¥#,##0_);[Red](¥#,##0)", + "Text 1 50", + "\"总工时：\"0.0\"小时\"", + "Left", + "Body", + "\"平均时薪：\" ¥#,##0.00_)" + ] + }, + "CellStyles": { + "1,1": 0, + "1,8": 1, + "3,1": 2, + "4,1": 3 + }, + "SheetStyle": { + "FontFamily": 5 + } + }, + "Spans": [ + "1,8,1,5", + "1,1,1,7", + "4,1,1,9", + "3,1,1,9" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "项目工时" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//rlIJuJXeVvEcEyvjQGWR2Za2CGeo8+4dh3Oe8RVaQDude9pAY9+8KnKsGbmtN21MurYM8XGqU/Ln379zLJrwtCRYqd8srrTV/jwe6GUa/XW04lpMuRmyulPRNHBwzZONeebPWPfw6hgJc8dgHgluMDOyeG45WEJsQSRj4g6DIx/IsSMo64V9vUDQBNcP55PSb27LDr06ThJQIDFskjZN52RDvXOAy2YeOiVAvBcKbqnGWWAVyqGCK4018oig3MYER228PeNVqY4aXAhkgmFD7FeovRfM30tEtXNH8EnZC7aVwMY6eqqTsdkfaNTUVjX4O5tATZhhVIrEUxlxnhm3X0x/3Atdea8+i90FdKd7DDUCk7K7MdryYpI7HlnpYaxJmprhiwoX6vgOW44SefPVx3WnDY34ax4MA7jm7dQxrstNJ8s6ZRt8m/kRszTxLKJv4kzlknGK+/8zgkQC/DrHV2lDneDFVsD5O6m+xE8PpQLdD/SNeormKhzCYvwXUj0UdUqrEHy/HwXImkwvViUKrdaXA+xGUDA1Uex0qTYf6x6q2c4Zaj6Gip4ErAXicOg18TLggSdH+wz1nGX66HC/BYfXsbI96OL/KsZf/vnGrLOTZXSZllj/zykzc0sR0QHYoo8xq/Zycm64n+G9YcyqZmP4/7Tiqexv2dbnryonHoxB0QpK78QnGuXE12YiUb3nxZexXwN0iQTcHJrhwxK085NsWWn15Rz7tX5BQ91FSa+PDFV9CsLHq0iwNIRvQR9KXjKx7b1aK6VbuvUvk1QZv5nQuMt8i5Qa3GdrWA2TsPL0yWrI3gk+PwKQNGwrbC7oYXf8PyNEsGr2g92dNJmqmKKjNoPXpseuZLTp2GTfvEv26cHlpXhKX02GlJw83fz4eU4cOX144B0u+p81AVum6A==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 9c9e1b60..d46e9a39 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -307,6 +307,18 @@ "ColumnName": "label" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "f25dfd58-1996-465a-8964-f9240fe2e490" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -563,7 +575,7 @@ "ReloadData": true } ], - "ID": "612c98d1-3f88-4245-ad2e-8ad85da6df82" + "ID": "b3159dd4-6b7d-4578-afd5-7c7304440031" }, { "CommandList": [ @@ -578,7 +590,7 @@ "BtnText": "知道了" } ], - "ID": "9fc91447-8cc4-4b4a-bb36-9a37f7d5565e" + "ID": "283bb28b-5517-48e6-855c-836ec8704cb2" } ] } @@ -931,4 +943,4 @@ "Formula": "新增报工!$L$4" } ] -}//hv3bXY2+GO496JJ3IKdQtHSsh4c6uS2iVSUJWpYYeP3SFypFsV6oO6eXwd0lnwcV2QAG6ltBFQhdlQuAz1IArZ13UaH8z9RYneYGzH8xMreiFf5b796kvEJp67m5dxp/FT9n1MTohNgwX+4oCPyiQfREisQzYwLqiTlWY/SWxAVtL2zOdW380GMNF3pS34D8qZ3ucvzAiyk1w/9of+ioSBt/7JduJgvErKn828UVLYvB+vC0dtMrB3sdxrIj2CfQFJTigDJRww3IY84ViFEVwcKaw78EfFbafKEWfurf2R0x6bFSpi2wMvgnX3cy+Vz3XbhK3P4k9grNrYkod0Jonn2BiVO7fGJAtqC9TkFXZYBopqW9MUSOb3oR3WRmJRYHNA5SsFyW2QKt6J5VvKMCLhxVnvyzKezUyf690/QQ8KzGitMUQh7UH9+xJhqRp15bh89qhVhiZDVZOwFTpxFJhnBLRAkR98Ghw0yulmhzIOARef82n+Y2hSV2j6D4ItajHIge2Py7YmP2R29ZwaiQtrAP2B4q2gj5SQKyH/4j/WMAzFA8TQc9ru6Ygh744iL6ighsTUrtvJSY5tNMnudvEhdiW5Zp+wHXxW4lsapTo27y5JFKUplEa961jzn8h9fPLTgpiXEkRdw3KXcCfrt3fPsnlAD80ftrn+ncajpVj/bd9neIUkwAjtgoNIlcCuraJEanuCZ6UjxCbql5wMZQiGxYWQ2aUEXTii1/tN/ncgfYKd+b0vyc5IXDmYnZJIeK++Pkf8mgx4jx6EUhrm68HLlgNRaOb0QWsgW/zTckBRDgCySgmiaeG/ttgTr78ArTC3bPYkjDVxeTOWqY2wrGOYVOpbFRr2+UGqi4883zKmXYn6pNz93IbPKYYliVd13jSKZwWv3OGgkK5rU1bV4b/w==|920 \ No newline at end of file +}//m4cB0g0+N5qS1m8oUa5CgCmth0stBnPo7WlMP2DQ8l7GyWmU4YcuZbHP8yYX0rNV3ekc4xxXpdYglAUobDibuCprF3uoKEcUZtKpQaQp7vHPadtNafM0e1anet1ArTRr0XjP4PaFEvGAdYda8C9OArPtcGgOp2yAbDIa+Sxes0OkjKSJ15ebIcmnM6hDTQG6zJEv4boA9GC+J1eTeqsAKwmXeZHHD4qX+E+9VMeNBs+AjVIgL3unwfS6HYp3yyULmGz9CBQDCRvtB8aE0GXKzR/MoAGRfbsEgL4SglepS3WMZAcN2yU6oF+oTc3ywLzx8VbI770zBydtm0j/DfBTg8uVl0irIpLre6461CSVX/nvnJg+qjcRh8L1zEpKdhSl8jAXJzAsI7tV6IG8eGnmuy9BU8ZbRidyD3NZ7tpT2fvdZhcyZxee1PdPKq8Ftmgvz9iyUNGKeA2kp5o+9lmDlEkMiJQRulVGbD8Pd2avfL0YO+BZReCojYWJKrkZ7ZOUh5zo52E5QtpkkJjMzDH8T2Q1eZFoUyZJpCuR4qnuL/67YiwXMqlpxR9hGIiMVVkzhOYQQcTjxub5pALIUeWCmRIdsKoIjRZYM6/p3LNpnitmMoBHpoGWhb85G5zEvfTCoEZioGlzSFKQ/VZiC5qdzNQHrSJugiAs28l2WxDNugqruomLNeJgxALE/yJBNJs2vUViJmIHamDUReMcEMtobBcps2rn2+EHrsszu0PWdC8N989BtzZ8Hi1Y0E1oi4GDymWajaqVZl4J+0aVWPtu+q2rB9ww1+UERC40NdRSVjXluVRsFUbKIrPDS+NuALOmOWwh07AyC0iXuy8n7EdcU9u7eWT+7CfYZmIP9Gnb6jLZZIENimTZNQoHgycQwWia17pVaBQ4PqrZ38bICf/4ng==|920 \ No newline at end of file diff --git a/Pages/项目首页/子页面/任务列表.json b/Pages/项目首页/子页面/任务列表.json index 51e84ce4..fbc7ce85 100644 --- a/Pages/项目首页/子页面/任务列表.json +++ b/Pages/项目首页/子页面/任务列表.json @@ -404,14 +404,6 @@ }, "ColumnName": "执行者" }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "参与者", - "GUID": "a08e0666-cbd9-4a6c-9204-8fc7b18ad74e" - }, - "ColumnName": "参与者" - }, { "BindingInfo": { "TableName": "任务表", @@ -453,6 +445,30 @@ } }, "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "ea034d55-98ef-4282-9433-ffe14da05a1b" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总实际工时", + "GUID": "86018909-acff-4945-93b2-0a4cfcf4f2ea" + }, + "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "f7b3021a-1c61-42d5-b731-fd4db30dbb35" + }, + "ColumnName": "参与人数" } ], "SqlCondition": { @@ -470,11 +486,13 @@ "CustomColumns": [ "任务名称", "执行者", - "参与者", "开始时间", "结束时间", "任务类型", - "任务状态" + "任务状态", + "总计划工时", + "总实际工时", + "参与人数" ] }, "Columns": [ @@ -527,6 +545,30 @@ "Fixed": "none", "Align": "center", "HeaderAlign": "center" + }, + { + "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", + "DataColumnName": "总计划工时", + "Label": "总计划工时", + "Fixed": "none", + "Align": "left", + "HeaderAlign": "left" + }, + { + "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", + "DataColumnName": "总实际工时", + "Label": "总实际工时", + "Fixed": "none", + "Align": "left", + "HeaderAlign": "left" + }, + { + "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", + "DataColumnName": "参与人数", + "Label": "参与人数", + "Fixed": "none", + "Align": "left", + "HeaderAlign": "left" } ], "DefaultExpansion": "collapseAll", @@ -624,4 +666,4 @@ "PaperSize": {}, "Margin": {} } -}//XOdf7gozaugWGwLrTiE/0BrQx72KPqLnM+b14MVrgqSSNBXHwG4jWZAoQb7nj29VV9bwcLml8si1pwQo20unyNWFHj2CTj2pQNU4SpQBaoehWVQRA4CVj5C/HmoYOcvqcCD9MW1vR6UOqwxuLR/0WrRfiAWWCjSOZFJ8nR39Rd/0MpjOIq5toSunUn6WsO4246H4k74y18zj6geYlE2l4yM6jCmJeH6YGs3nZbG8KuAsL8gJ6nSW+JTw95LpbjkcrMktqUDy8kXyktYT5C8TxfJhoTG62aIFVTlALDEdVx3zk34C8PcphZmZbYyrHvpFBmwyCVDzWCM0/YAsvndFKEDUbsK0L2Tc3UieTtu+c3a8yl/7M/IlRoqO1JhC/KnyPdM/trpCSiCEcpMfvMuYoFb/eBt49oDxUFX1/aUj3mErM20M15C/VTXBFXRqwdK7yzpWaK/kPRyHR0V/Z/Oq4vd7TnGcThK7ztCh7vJ1EOfmmvGR6cjsTSKwQ4T6FKwZsbnJuXG1NAmg1xw2WiHPpvVEugVbOVz7P9cxUUnRo3jE9xss5uoI9ZFaLXgPZcDuuq+C7ENiwpfVSWxXYNDE3fUikN9klzK23d87cyAMioULB6GgFyU+GazSevfyC0OQROXqB9GxCumJtoI7jlj8Ja/0IllRppMSDZVjur1qxA8egfhNKWFO07qrzEClQYyemvuAFXGGaHDranMLHv/xuHG7Swf5KPeXCOHq/3inJf6GanjoMA6ZkR5rnHtpJwljtJZxbt61u4hbArrttFLFDczUARWiK7V3nlljiVbSQ+uUHuPA9A07Z2OZ/cfo25d+7FcDZQp8xGU9M93MRUnIVfMe/NLB8WVFK467feRxn9EN4ijtiwqe7kXuQo8l/JAyXIVJBXogq6UGOUCEu4jLVA==|920 \ No newline at end of file +}//bC9frGUvWJHYmf2pv8jZLU5Hlckyj2TpzI2MNhPaBKLPZSod2SO8qzc8EJyVopeTEK6oUaGEo3vsc/FciYmfi5pHnNpewWFLG0ODZk2FwM59zmjWS95qN3UeHsKjE2Ho+A80VMi840I7owzeZgdRnFI0xPBQkQw+WTwwbvqfKhia/KEgFiXWG32T9FvaSdkPuhvpEpqboXO9CoOF0X2NFtZBg8OpYLDdoT2ujXNOHbBHfblgtsBJ6WK4cKI/nBp5Nx6e9fB8yt0C4sMrjd8x9XMeiHXDx9RgswqVYc+LMF8UySFGLXD98nCZD8xULmRdQ8aSA8WhPSrGbUIh1IfkaaenCcccig6Hc9U07dRoDy6Z/7Gc6nklyOJxCh6SZzH1lpCHPyMuc+OMnHPlKWeeVLXPp5RG71pbsClOFjrOCn9y7TPFHpIKtIVAn+8QyQxA8DqQKxOYEo8FgiwKVYPkb+zTyVwRYttk3DK15AUFuaCrUVXy3JLaIyY51F7jMOd1EOQs4TbQtTwMQvn0k6Cz3cgikYrh/gOX330Y3jvk8c3tg04v1TzYF18f0snXECegNfuCeJLGMPrjvuuSlNSviacF+i9r2WXpbo2denX2ZmrYR8zWX67wNtR69ka1TBZ7qCsP2XIB+a14jgxtNKR04N96zuv/kj9AknR4aRBjghZ9kuB/1UNE/jM422KQQniQ0sIjy0wuqrcxkIoG8O7/ZNHW47FrAji9MfggUjvvm7+ZiNXBBPsrkN5R5uaw3HLzDZbVVu+2+GzAaJGcjFr7ViqpMHDJBVGHYPhhFMh7UZcRMq05v8I5Bz0vqZkcNR9BJFbWhMJHpsaFcsfx7LKWNKJzkMK09uaeFm6p8uWSdkih2/iO8fThRtWVERp++6QnqXjztW4zrdeSV2EXS0FHqw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目工时.json b/Pages/项目首页/项目工时.json new file mode 100644 index 00000000..c1d6daee --- /dev/null +++ b/Pages/项目首页/项目工时.json @@ -0,0 +1,920 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 642.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "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, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.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 + } + }, + "27": { + "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 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 40, + "DefaultSize": 32.0 + }, + "Values": { + "1,26": "任务详细视图", + "1,35": "查询" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7d64e005-8d62-44aa-a015-29088b3aff0d" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "43051133-4cc8-4dab-b81e-84cf9316c6f6" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择成员", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,11": { + "CssName": "singe-box", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "Items": [ + { + "Value": "", + "DisplayValue": "所有" + }, + { + "Value": "计划", + "DisplayValue": "计划工时" + }, + { + "Value": "实际", + "DisplayValue": "实际工时" + } + ] + }, + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目工时!$AA$2=\"任务详细视图\",0,1)" + }, + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } + }, + "1,26": { + "CssName": "singe-box", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "CellDefaultValue": "任务详细视图", + "Items": [ + { + "Value": "任务详细视图", + "DisplayValue": "任务详细视图" + }, + { + "Value": "人员统计视图", + "DisplayValue": "人员统计视图" + } + ] + } + }, + "1,35": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目工时!AA2" + } + ] + }, + "value": "任务详细视图" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "数据列表", + "TableValue": { + "TableName": "任务工时表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "7593bae3-27a6-43e9-a346-a1507f61a76c", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "e170c2c3-8d4c-4f00-b146-b0fc9d609f6d", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务类型" + } + }, + "ColumnName": "任务类型" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "52692137-5179-4a8e-ad2a-9627ce5a8f86", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人姓名" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "a0aeef52-6aa5-4690-b94f-fabe336fdb52" + }, + "ColumnName": "工时类型" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "977f264b-2c6c-4726-af0a-caed0861864d" + }, + "ColumnName": "工时" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "e30fe517-f5dc-4259-9196-80dde78c72d2" + }, + "ColumnName": "时薪单价" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "计算提成", + "GUID": "d3bea778-02d8-4b74-8728-03a62e00764c" + }, + "ColumnName": "计算提成" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "7021c88b-4a53-4ea2-8dde-c3725cd70a5d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "8da50797-986d-4783-a570-49dd42792679" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L2" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "28afb3af-bedd-43b7-afa7-46dabafd52c8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!B2" + } + } + ] + } + }, + "ID": "afe174cca1e64659848f287da52ca4c3" + } + ], + "ID": "e3bafca6-ce95-4bab-8e13-26e1b7785172" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目工时!AA2" + } + ] + }, + "value": "人员统计视图" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "数据列表", + "TableValue": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "bd24178f-78f7-4800-b5d5-d565abac0d83", + "RelationBinding": { + "RelatedTable": "用户信息视图", + "RelatedColumn": "用户名", + "DisplayColumn": "全名" + } + }, + "ColumnName": "全名" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "f0147ae1-caa9-4251-afe0-48bc16f9c4cf" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "8bb51062-95b3-4443-bb6d-88a9631193e9" + }, + "ColumnName": "总实际工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "d6dfdf98-880d-495c-9d33-d4756b2926f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "a45cad43-2650-422c-b4e9-73d2bc590999" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!B2" + } + } + ] + } + }, + "ID": "4137fcecbd804978ab5d58f8107b6deb" + } + ], + "ID": "50c77d5b-9f6e-45eb-8593-79b475366352" + } + ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetJsonDataSource", + "ParameterValues": { + "dataSource": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!数据列表" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "执行人", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "执行人", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "17497400-e0c4-4366-89d6-33e31abc98b2" + } + } + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "Text": "查询", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/047_search_8.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "57e644c056074f9d885f24a5bd7b4ae", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!B2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!执行人" + } + } + ] + } + ], + "ParamProperties": { + "执行人": "执行人", + "总工时": "总工时", + "平均时薪": "平均时薪", + "总提成": "总提成" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "任务工时表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "8600c93e-aeaf-4590-a7cc-623d0cea2a62" + }, + "ColumnName": "执行人" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "62205182-0339-4653-baa5-9ea7d410a66f", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人姓名" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "3c4723c3-0263-4bb9-b077-6c55b231052c" + }, + "ColumnName": "总工时" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "平均时薪", + "GUID": "ec2b99a7-bb48-485d-a4dc-cfbb360e3bad" + }, + "ColumnName": "平均时薪" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总提成", + "GUID": "cb5a3cb9-c29b-45ce-9854-603dfde081bb" + }, + "ColumnName": "总提成" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "f93371a2-2e00-42a2-9cef-134287c59879" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "TemplateKey": "BlackWhite", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "3,11": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "columns": [], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "showSummary": true, + "sumText": "合计", + "size": "default", + "emptyText": "暂无数据" + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "2c63cef9-3953-4125-9367-3dcca8671612" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1 + }, + { + "HorizontalAlignment": 3 + } + ], + "Types": { + "Strs": [ + "black", + "Body", + "Right", + "Center" + ] + }, + "CellStyles": { + "1,1": 0, + "1,11": 1, + "1,25": 2, + "1,26": 3, + "1,27": 4, + "1,28": 4, + "1,29": 4, + "1,30": 4, + "1,31": 4, + "1,32": 4, + "1,33": 4, + "1,35": 2, + "3,1": 5, + "4,1": 5, + "4,2": 5, + "4,3": 5, + "4,4": 5, + "4,5": 5, + "4,6": 5, + "4,7": 5, + "4,8": 5, + "4,9": 5, + "5,1": 2 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,1,9", + "3,1,1,9", + "3,11,1,28", + "1,11,1,8", + "1,35,1,4", + "1,26,1,8", + "5,1,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目工时!$B$6" + } + ] +}//Jbe5yB0tibrvAIkQyDHj3vFh9xy4NF4PUKEMrJPrfGk+bTR7qciDVBgTCgJHx6d47ZzAeTf3WCwFWPWgudCRVCqAmMj5bW9kIawVl7wa5HFlRBKkz701Q7jZrcHG8gHOFQouSbW78OvKEY9HqtSX3WhpmZEtXwuGgqtxdn1Z7r5hKYjH5uGgmnrmddsRwIwfNb5MaKI1iFFw2IZJ8NZb7LqMbNFYtiJHZegzi4ciekj5iwtuPfvqBdQAgIx77GLjRVxAZ/we1/FHpLD009E1WZWR664fdB2jAdhWke9Dh5aNxCzSNKg96bAXPdvXPkExKitdzbasW3kgq0FQUqDn/K5JH/bC7oRJhBqralt1FmQ3gZwJ7gc3gKL/WJEnbzjyQRujmy+xLTgK+Hj4N/f9gRh1wwsEiHCGVX1OQ6LCpC6MCIRfdm1AE17+w/RnxYL/Vn4GMA4NsbBr+JxWkq8sYn959H0eV3fml0/Wd6koIcwsG3ccpPGx4oY3uD7M4JVQKoRHVTM4ZFZXJ4NpeW7GYGffCPVn/tfwhh611vaVWI9paxYvGvXsf8eXsujlhxoEx47VYZWD9hhAnmIeDGNtAUiIpJGV2Neu4eCstq47IPVuepw6gLSzWSY9qmx4Mz5moOe1FSF0BwLtAy30mRt0weiHM9L4DeIV35qKOW3eDC16cEPoZOsP4Sp5ekeUP5tPEjcFFaYw3sa+3NGKBxP+Wuhxs0fZJ3iZIOdaCoOvFLymrUUareMOpIhACoWXwIxNPFTkjaTARXqrS0c89flGjWcSF9veaiGXhHdAMBcY8Fr4/c+aKl2mRed+HfjCgJJ9J28BexBA+wnewgq6vpi4oBO5AL/ph/QQuniVlwO9SFdN5BUCTjfR3swl701Ymq1CSdpuyuiHDO+MYpE8WXVTIA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index d2f05e4d..ff584ae5 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -29,7 +29,8 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 31.0 + "DesignLengthInPixel": 31.0, + "IsHidden": true } } }, @@ -299,7 +300,7 @@ "Name": "任务" }, { - "Value": "工时", + "Value": "项目工时", "Name": "工时" }, { @@ -311,8 +312,8 @@ "Name": "人员" }, { - "Value": "资源", - "Name": "资源" + "Value": "负荷", + "Name": "负荷" }, { "Value": "钉钉群", @@ -381,7 +382,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "96099ff09b9a4f4d86fd9d5e347e94a0" + "ID": "32945e5d3be94a3984adea5b686b590e" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -418,7 +419,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "0fc9be27-5a59-4e64-b510-dc3512a627bc" + "ID": "83b53026-036b-4953-9a8d-3e289704ab90" }, { "Condition": { @@ -439,7 +440,7 @@ "PageName": "项目配置首页" } ], - "ID": "cc4f9e69-2d9c-4f07-9749-c7d6937c3e47" + "ID": "9687c6bb-9254-4821-9d24-6661c50fc252" }, { "Condition": { @@ -475,17 +476,17 @@ "Message": "操作完成" } ], - "ID": "7b8a4c0c-89fa-4884-ba4b-38c3f9ad9b4a" + "ID": "6cb958d0-39fb-46b9-b54d-1f4b84873b16" } ] } ], - "ID": "84bcf540-5f65-4d23-95bf-76eb4508a7f2" + "ID": "53aa8768-bce0-412e-95cd-7a8c8858b509" } ] } ], - "ID": "56d8c967-2825-43f4-b980-195d820bc2ed" + "ID": "2979608e-9ff8-484b-9406-c2641c4d490e" } ] } @@ -601,4 +602,4 @@ "Formula": "项目标题!$M$6" } ] -}//c7haDTQfLIC1rI9u18mootzRH/3N/zgcnP2t8adiqnwedUfLsKe4VsKFf0hLhNkGjMSnWmiXwGVsndHSYVkhHRMl63IIUu6+EzZonUlPYsQXw81afjFpyUhKm7EQOjh3DkH45YkFmam6zJpUekJnuD7qzKjik+pvwY8ZXn/E2DcAZ2afZvFxgXPB50iNBbM692oHH8k42800a5xOrQ72gnMk1HfNK6VUx6Xpq1AWKQ+FEmG7qNfxn9KD/gJfm7z+4DFZw7ja9oZMlLhfDRoF6IeNtNkhDiotrAhn0d/SLBjTEkGYGHW8+WPtgbshFiXUayDwo17ywLwkwKEOaqlMNCzgkY+pnNxbyq+BUe0tfhpt9GBNXESAgk4+sy4iv55iNYufq2k+0km1TLAcVIOdSxAGCK8L//SBzWq1dUHTIDiR9GWhs7/HveN6rqBm2Vwf3/8TfRT82j095Gb13GT4X4mYyRVXcC4In3vYx4R7gGIo5vAVoM58DIhXAo5otTY9eId2Nv43iVSqIAWUkAgRtN7SrAg58GkINgkBcbpPzicC3hMBoEo9nfIk9Ph2jYWQGwLHqJS6TEtdPXbw6PB7IdTR2ioPhDsiFvcq+S0pmNMBF/aHRxkIQoNDP9H3kLrns/+cpznjtbYOIaqRiV4q7gz0zYMqjTIMzLjsNWKFhfsS7TNUaR9qWB2E4wMGWv40AIQufNRiEM4Jl9oRrayQYtmFua71PDXDHHaUkLkzRZ7YnzrGPbRoWmNetqKwHcR9zZhvC2bqyOG9di4MrsCICnISoc072vCsYo/YI+HmPriS3h0eARQgP4QSMq9Aa+qVtYDu9VY16bykJ3huTDNppgu2LsPYzGTYQU+5+dgbpT/OhwQoXLZK4baTROr0wmMDpuM3vbjwMf9L+qftlFaKOw==|920 \ No newline at end of file +}//KuoLVqRO73MBsPtujbXq3KMqSt6d4jOeNa16swp6PlFJGwjiWKWjaHVvmbvpz18ufmed7G3+03l3htBw+zf32nNFLdOqtS41hcUBz1ivXEuNmWoG7bPaf2iD6u46OEWmDH/msD4mLI1UTMZ4aPENMJwsOBSZqd9+Nqf61xM36X1fSQXDNuLeDc2JgpijMH/tEESuwSVy+nmkueZT+SvJpuaVz2UxeMsw1imwniiZRomDEdkr/QnUPTHBbiJpzyRjP3BVAryiEuwRFxD6PyHqAr/8p4asayY8ig7owvOyodXg61eapmzWWsNVv3psXEHTgnFSG+cPEhI9CR7RppsxQiNMCOh3yriG27NFem0kFghJgV9dpGZcqM4qhWeHq5yfIWg5aQT9RWr9/xNK+AaTnq41NXMv6f7dJuOZcs77igkH32n8JblF2j/FLdyntjEooj/tfqo4IaX4FPT9icFBxc6Pl17AwRKAYe5HerzId4R61fll+kxsp/dSCyVRTsKNA1OYO68mUh5zBsL9cMXIA+cOSWptMH/Z9E1WZVWue4xkSmLtX8fNl/DPlis1/lcwlPveLA8OnHo4sPWPNDjrUP7In9DtFJohsodMMJsGayZZXEI03yO4ReMkHgVVrNr8RwD3P8dQGaGbmbrt4U6qqOJ5SKptwzg3QUN4OJhL54KgxbWCeMASP2Usi94srAQqQWJN8kc9+etWBca2Ljy8oVvPRVC1oZgIoFEA+wXojISYM1qwQi1keESsw8VFFKPY9qb5jsFvaPZiW5UeE3pJkaWCf8yYw1bupVcFnagdI3mY0eRPWtxpvuYaSCG7dam+kbRLR1wqwLeOa8Q7JCa+A82/SUgfZdgvW2k5zWc5ShhZILPK28YsQNJq9FwhJvF7ct8XJWcwEPeK239Xrur6pQ==|920 \ No newline at end of file diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 51b267ff..7ca7f8ba 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -92,7 +92,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "30658003-478f-40bc-bec5-21323cc4acb9" + "GUID": "bf1892fb-3938-4567-bf3d-03d0108ec470" }, "ColumnName": "项目ID" }, @@ -100,7 +100,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "bd55e51c-f8c0-4411-b7c8-3e50c87bdd7e" + "GUID": "99a610c7-d74e-41dc-8b6a-fdb8dd30874d" }, "ColumnName": "任务状态" }, @@ -108,7 +108,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "5bf81dab-5b37-4eb0-be4e-18037fd35888", + "GUID": "74bdda59-4098-47df-8405-fb0214c6e424", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -121,7 +121,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "426ce019-dcb5-46a3-8147-1bffb07a0b18", + "GUID": "01bb3df8-0942-4ead-935c-6f935c35ee66", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -134,7 +134,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "53087541-fe0b-413b-8f8e-1779bf6bd16c", + "GUID": "adfd8b1d-91a8-48dd-9c09-b0b8834a405d", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -147,7 +147,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "84fc268c-bf7b-4147-bed7-155011320551", + "GUID": "373bdd3a-1052-44e5-beb9-843f8827f61f", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -160,14 +160,27 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "f2452327-3883-4cf3-8413-6203bb7b43b9", + "GUID": "f25e468b-e478-475a-8338-b29a5136c34f", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", - "DisplayColumn": "默认工时核定方式" + "DisplayColumn": "工时核定方式" } }, - "ColumnName": "默认工时核定方式" + "ColumnName": "工时核定方式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "8c7067c3-a8e1-492a-afe0-e1d046fd2c15", + "RelationBinding": { + "RelatedTable": "任务类型", + "RelatedColumn": "ID", + "DisplayColumn": "提成系数" + } + }, + "ColumnName": "提成系数" } ], "SqlCondition": { @@ -175,7 +188,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "b756dff3-adfe-4149-bcf5-11b9c40ef0e6" + "GUID": "5ddc304c-99c2-4a9d-9fd0-fb58421f3730" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -185,7 +198,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "929f17779e0c4d99aaf4f46aa7264abb" + "ID": "2918ea32f3884e7e98305ac9f149746f" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -198,7 +211,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "59aedf59-110e-485a-b423-bcd39b775e75" + "GUID": "726fb609-b6ac-4a09-b21b-759b5bc6b612" }, "ColumnName": "参与人" }, @@ -206,7 +219,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "98aa8733-230d-4c50-899a-3f9191834e67", + "GUID": "c3a3ac42-a9c4-4e1b-844b-784720a48929", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -219,7 +232,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务时薪", - "GUID": "2015c0d5-1299-4d27-b8b6-ff4a26cce7d7" + "GUID": "c9bf3e12-738f-4805-adae-174e64aacbf0" }, "ColumnName": "任务默认时薪" }, @@ -227,7 +240,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "6519575a-3bbe-4c37-9da9-1aef4ba06859", + "GUID": "4f17650c-15e6-4e68-ae15-7740091c7f81", "RelationBinding": { "RelatedTable": "项目岗位", "RelatedColumn": "ID", @@ -240,7 +253,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "f48e0ea1-c309-4cb5-9c32-87020502b86a", + "GUID": "fc12088c-5de9-4f86-8344-767b6c2bc66f", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -255,7 +268,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "ID", - "GUID": "20e214aa-5692-4637-a78c-216bfc9708b3" + "GUID": "a2a8e4cc-4325-4ee1-a217-cb701c5b3c4b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -265,7 +278,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "71614a0f129141b5bde65657df1d0bfd" + "ID": "c04d6f601eae4b0d86569a7129aef361" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -290,10 +303,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" }, - "ID": "8da0f282ca844012842bd0beecb5ed92" + "ID": "f857e1363832441b9ce2d6788691fa4d" } ], - "ID": "814e11f3-9661-4fb9-948c-964c735db926" + "ID": "1c245c57-b8f6-4ee2-8941-9448c189cf06" }, { "CommandList": [ @@ -304,10 +317,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "e60f8982826348f182313c0fb4b84f3a" + "ID": "59b15e69447446c49ec84c9a3121f667" } ], - "ID": "b89eb085-b0c8-411e-a6c6-96db03a20492" + "ID": "649c9460-8b07-49d5-a5c7-fbe19280dbf4" } ] }, @@ -358,13 +371,13 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.默认工时核定方式" + "SerializeProperty": "=任务信息.工时核定方式" } }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总计划工时", + "ParameterName": "总统计工时", "TableValue": { "TableName": "任务工时表", "OnlyGetValue": true, @@ -374,7 +387,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "4a9d56c8-57ea-4e91-b39f-1abddfff05e3" + "GUID": "b017e325-7294-416f-8926-47462784d7bb" }, "ColumnName": "总工时" } @@ -387,7 +400,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "16004d07-1b90-4d20-860d-b97019f2829c" + "GUID": "16b0ba7e-6a71-4a46-aa40-3f4d6ef58f5d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -399,14 +412,17 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "c9a1b4db-dc37-457f-9fd2-593dd9487b8b" + "GUID": "a45113f8-20d0-409b-bca0-4f362620dc21" }, - "Value": "计划" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.工时核定方式" + } } ] } }, - "ID": "9b9825bc5aa24e159d27259c07a9ebbf", + "ID": "6ab1910c7268409f9266fb8e480a337b", "Comments": "检查工时是否超支" }, { @@ -419,7 +435,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总计划工时+工时数" + "SerializeProperty": "=总统计工时+工时数" } }, "value": { @@ -438,7 +454,7 @@ } } ], - "ID": "4c5503c2-583d-40c1-b74d-ebf56887982e" + "ID": "eeeba5d7-dbf4-493d-99ec-d91f069d4c35" } ] }, @@ -452,7 +468,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "0da8b305-24c1-4de1-ac04-bd4c4f3bf0c3", + "GUID": "ea4383ac-a4de-4d16-810c-5c1b13209616", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -465,7 +481,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "7a8bdedb-03ec-478d-be75-97a5a5a2095b", + "GUID": "6e7f9872-9cfc-4c3b-a64b-f99301cf1ad2", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -478,7 +494,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "b28ed0ac-3392-494f-9906-e0e37d91bea1" + "GUID": "fbf14cf0-4f6c-4f3e-be40-5b2aefb7c3f2" }, "ColumnName": "总工时" } @@ -491,7 +507,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "18302667-d429-4d0f-b620-fa6903b1bdff" + "GUID": "f01504a6-9268-421d-ab6a-294bbb8d9fe9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -503,24 +519,25 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "5e9a67b3-4db6-4a54-bdc0-004844401b1a" + "GUID": "659082fc-ef0b-4cb0-a586-1b33af5b82a5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务信息.默认工时核定方式=1,\"计划\",\"实际\")" + "SerializeProperty": "=任务信息.工时核定方式" } } ] - } + }, + "NullFormulaValueQueryPolicy": 0 }, - "ID": "f84fe0844214461fbdd56060934dfa24", + "ID": "4797723e6d2e41a5a0189fd1df0de453", "Comments": "检查预算是否超支" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总消耗金额", "ParameterValue": "0", - "ID": "ea3316190a0d490fa5b64c2be167533d" + "ID": "bb9e54fcc34147a397b97625b51722e5" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -540,7 +557,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" }, - "ID": "299d3687c3d1429791f73507bea2d5e6" + "ID": "a2e540fc04904c0b8ca6c555bb97506c" } ] }, @@ -573,18 +590,18 @@ } } ], - "ID": "c1223bd2-b2d4-41eb-8f10-f543c38f1df8" + "ID": "642806e0-05f0-48a0-aceb-5ae4749fda53" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "2a0cc0b3-1b76-4dbc-a2fa-0653012c057b" + "ID": "bf08f70c-e62a-4a64-8514-aa5324ab46fe" } ] } ], - "ID": "2a7b87a4-8485-4290-9259-e7cd590d159d" + "ID": "cdb7621d-e9e6-4ec8-abaf-5cd4e2fadede" } ] }, @@ -595,7 +612,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "d63b795db2da442a826146ac7d87d239" + "ID": "88917d0b705740d8b313707d17e90999" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -604,7 +621,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "c050ca8a42f34ec0a7b4ebfbda3c2a47" + "ID": "7456d05ca461469aa54b4c73e0846743" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -628,7 +645,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "aec022bc176243ac8935e01cdc2e6cbd" + "ID": "75877f8fc2f04457b6bd9d5e0d88e559" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -641,7 +658,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "94b49e51-4abc-4781-945f-1a44c5cf2048" + "GUID": "18cc1de2-9116-46f9-ba28-3ee44c656ae6" }, "ColumnName": "总工时" } @@ -654,7 +671,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "609e8eb1-c8d4-4888-81ff-fed104c1dcc7" + "GUID": "144919b2-9e90-407e-ba06-8962389bdd23" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -666,7 +683,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "98133852-dd53-4274-aa8d-760332dd12a6" + "GUID": "76228856-18aa-48f6-9882-318807a68c22" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -678,7 +695,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "e42f6081-4cbe-4467-80e4-01d754edd4b5" + "GUID": "2ea16072-94ee-41df-9cc2-a5a180d27e49" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -689,7 +706,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "ca5ea7f6ea644851b29b2a59813bb41e" + "ID": "6ae0baafed3c43ff991d2907d1337efa" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -718,10 +735,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "cb85c2cb59854a3fbf833f96a3acd658" + "ID": "ee71499449414ba18a628588395d9a05" } ], - "ID": "bd2d2e56-e0ec-40a2-ad29-0a3d4e8b1484" + "ID": "1b3b80d1-30ba-4437-a6d2-d2de40fa6fa1" }, { "CommandList": [ @@ -732,10 +749,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=待分配工时" }, - "ID": "5574195e75eb4eef8f2e352e0e1614da" + "ID": "065c1e760198465994a08493bf43cee8" } ], - "ID": "5c13fbe4-5acc-4b1f-a4f9-dad79a18762d" + "ID": "b0fb2618-d6ac-421d-8210-c4fcfa690770" } ] }, @@ -762,10 +779,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" }, - "ID": "1d64577832de466897d1c9a953717594" + "ID": "16181c6e15ff4bfca56ae0ad14d4352a" } ], - "ID": "8b9b2eb3-1503-424d-951e-980100744035" + "ID": "bfcd2708-a55c-4839-8795-d34f4c7eb2a4" }, { "Condition": { @@ -784,10 +801,10 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "执行人负荷", "ParameterValue": "24", - "ID": "518ad3dadbf649fa9409382d3c7209bf" + "ID": "2c4d16f4fa6846e3a912eeabbf37bd0c" } ], - "ID": "50b18a15-5e90-4cfc-aa4d-a801c1aa1806" + "ID": "394dd2a3-3994-4c7e-a7c2-0ff8ccb80bf2" } ] }, @@ -798,7 +815,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" }, - "ID": "452168f697db479aaf2e519ffb7e824a" + "ID": "0a10581e19f140f89affc63ea059c53b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -827,7 +844,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "0bddc8cfd55c4c2c92dab2ad91ea5ff4" + "ID": "a93edabfac4844a6a4f4c730b7ab5e56" }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", @@ -839,7 +856,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "9d9f1cc1-16f2-4806-b4cf-b4018d0fa411" + "GUID": "332787ca-aa7b-4138-b767-e2108d622a9c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -850,7 +867,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "aee3ecdd-3e2d-40f4-87d9-64eb28fc7da2" + "GUID": "1828713c-8fe2-489e-b6d2-260a7d75f5bb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -861,7 +878,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "dd897598-9e8f-41d5-87ba-1204a02fe873" + "GUID": "dc7feba1-4718-44ec-bd0e-4dcd1d8b599f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -872,7 +889,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "af2e2347-3dcd-4495-a5cc-29dc7b10d7fa" + "GUID": "b6d34589-36d8-4086-bb77-0ce31f5de1ee" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -883,7 +900,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "a02bb91a-4c83-4797-b7fe-e6546548fa2d" + "GUID": "3aa4522c-b52c-4516-8c59-64a72900ca73" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -894,7 +911,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "39b2029e-52a9-4338-afc5-305a95d0cbc6" + "GUID": "15e671e3-3910-4106-af0c-4e5d18e2c415" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -905,7 +922,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "abf4b9bb-ff79-42e7-a3e5-d6cd5393010c" + "GUID": "5a62de3a-7bd3-414e-a942-c55c80e8bd4f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -916,7 +933,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "29ab3f03-9006-4fa3-b2c0-bb08e4aca8d8" + "GUID": "3f0f57b0-84af-4b2d-99b7-9156ace3d9b4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -927,17 +944,28 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "95a3adbb-b9ba-4922-969b-1655ebfd738a" + "GUID": "ec8e90ba-7a7f-4d1a-acc3-c4b37f8c735b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=计算时薪" } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "8b7a0e62-d18a-4818-8273-09551c642141" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } } ] } ], - "ID": "a25fb449-e0f1-4eda-af74-f0bbb0fce524" + "ID": "e957afd7-08c6-499e-ad39-975f0632d285" }, { "CommandList": [ @@ -950,7 +978,7 @@ } } ], - "ID": "beeaf738-6851-4f9a-b488-4cf61794e40c" + "ID": "78590df5-7698-45b5-a91a-b5c4e76272a1" } ] } @@ -964,7 +992,7 @@ "Message": "提交工时成功" } ], - "ID": "1cdf6748-407f-4f0f-b616-e1d5006f3f5f" + "ID": "a4a1b163-561a-440b-8687-0a1814006775" }, { "CommandList": [ @@ -977,7 +1005,7 @@ } } ], - "ID": "a62187b1-5de9-4d78-9420-5cf793bb5ad8" + "ID": "e8d00de6-b73f-4c47-b34a-67fece1f6456" } ] } diff --git a/Tables/字典表/任务类型.json b/Tables/字典表/任务类型.json index ee5481bf..7baf81a7 100644 --- a/Tables/字典表/任务类型.json +++ b/Tables/字典表/任务类型.json @@ -18,6 +18,13 @@ "Name": "任务类型", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "提成系数", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index c3dcfb66..f519f8ce 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -74,6 +74,19 @@ "Name": "时薪单价", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "提成系数", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[时薪单价]*[工时]*[提成系数]", + "Name": "计算提成", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", @@ -100,6 +113,19 @@ "DataColumnName": "工时", "Name": "总工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "AggregateFunction": 4, + "DataColumnName": "计算提成", + "Name": "总提成", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "DataColumnName": "时薪单价", + "Name": "平均时薪", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json index 85693975..827f93f1 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目任务/项目表.json @@ -63,10 +63,10 @@ { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DefaultValue": 1, - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "varchar", "MaxLength": -1, - "Name": "默认工时核定方式", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "工时核定方式", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",