From d0de61a26883c7627dc7d67a56263cd9368e1e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 18 Jun 2024 18:39:34 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E8=A1=A8"},{"St?= =?UTF-8?q?ate":1,"Type":23,"Name":"TableView/View=5F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"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":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BB=BB=E5=8A=A1=E9=83=A8=E5=88=86"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1,"Type":1,"?= =?UTF-8?q?Name":"PCPage/=E5=88=87=E6=8D=A2=E9=A1=B9=E7=9B=AE"},{"State":1?= =?UTF-8?q?,"Type":15,"Name":"ServerCommand/=E5=8F=98=E6=9B=B4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81"},{"State":1,"Type":11,"Name":"User?= =?UTF-8?q?Service"},{"State":1,"Type":15,"Name":"ServerCommand/=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E5=90=8C=E6=AD=A5=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BB=93=E5=BA=93=E5=88=B0=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E5=90=8C=E6=AD=A5=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=89=80=E6=9C=89=E6=8F=90=E4=BA=A4"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=89=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?"},{"State":1,"Type":28,"Name":"ProcessItem/=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B5=81=E7=A8=8B"},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E4=BB=BB=E5=8A=A1=E5=B9=B3=E8=A1=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BB=A3=E7=A0=81"},{"State":3,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":3,"Ty?= =?UTF-8?q?pe":16,"Name":"TaskScheduler/=E4=BB=93=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=8B=E4=BB=B6"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 259 +----- Pages/557031284d494486b3b32eb2329c19a.json | 22 +- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 8 +- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 45 +- Pages/cb2a6325e1334f5fbcb7270deba57ec.json | 170 +++- Pages/cb2a6325e1334f5fbcb7270deba57ec.rd | 2 +- Pages/任务/任务-基本信息.json | 34 +- Pages/任务/任务-子任务列表.json | 163 ++-- Pages/任务/任务-工时.json | 144 ++-- Pages/任务/任务部分.json | 69 +- Pages/任务/任务首页.json | 26 +- Pages/任务/新增任务.json | 501 ++++++++---- Pages/任务/新增任务.rd | 9 +- Pages/共用/切换项目.json | 28 +- .../项目/项目首页/项目配置/项目岗位配置.json | 24 +- .../项目首页/项目首页-容器页面/任务列表.json | 138 +++- .../项目首页/项目首页-容器页面/任务列表.rd | 6 +- .../项目首页/项目首页-容器页面/项目代码.json | 21 +- Process/新增任务流程.bpmn | 6 +- SchedulerTasks/仓库新增事件.json | 122 +++ ServerCommands/Gitee/同步一个仓库到表.json | 38 +- ServerCommands/Gitee/同步仓库的所有提交.json | 23 +- ServerCommands/任务/任务发起流程前校验.json | 49 +- ServerCommands/任务/变更任务状态.json | 115 ++- ServerCommands/任务/新增任务.json | 533 ++++++++++++ ServerCommands/工时/计算报工数据.json | 758 ++++++++++-------- Tables/任务/任务平行视图.json | 13 + Tables/工时/View_任务工时统计.json | 1 + Tables/项目/项目表.json | 1 - UserServiceDB.sqlite3 | Bin 565248 -> 565248 bytes 30 files changed, 2200 insertions(+), 1128 deletions(-) create mode 100644 SchedulerTasks/仓库新增事件.json create mode 100644 ServerCommands/任务/新增任务.json diff --git a/.collaboration b/.collaboration index 2d44bd12..f482aae3 100644 --- a/.collaboration +++ b/.collaboration @@ -28,16 +28,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:21:55.2488586+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目成员表", @@ -153,16 +144,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:01:49.5905673+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -576,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:25:39.476827+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -656,19 +626,7 @@ }, { "ModuleName": "PCPage/项目岗位配置", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:27:51.9261759+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.rd", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.json", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -712,31 +670,11 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:41:01.5977408+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T17:39:13.7852055+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务部分.json", - "Pages\\任务\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", @@ -744,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T17:57:54.5602261+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -766,35 +694,11 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:30:03.8998016+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:20:22.4711025+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -810,17 +714,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:28:41.7584595+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -868,19 +762,7 @@ }, { "ModuleName": "PCPage/切换项目", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:19:01.9500567+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\切换项目.json", - "Pages\\共用\\切换项目.rd", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.json", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目菜单", @@ -1100,16 +982,7 @@ }, { "ModuleName": "ServerCommand/变更任务状态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T17:57:54.5599109+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\变更任务状态.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/修改任务预算工时", @@ -1617,18 +1490,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:15:08.0702834+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1664,16 +1526,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:24:30.150564+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", @@ -1773,16 +1626,7 @@ }, { "ModuleName": "ServerCommand/同步一个仓库到表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T16:10:09.0730733+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步一个仓库到表.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/搜索仓库列表", @@ -1938,16 +1782,7 @@ }, { "ModuleName": "ServerCommand/同步仓库的所有提交", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T16:08:55.8279907+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步仓库的所有提交.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/d3148bd6742da6598200d24b4966ba9f.png", @@ -2067,30 +1902,11 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:21:57.83774+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T17:57:54.5602317+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", @@ -2150,16 +1966,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:00:26.313255+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2179,21 +1986,7 @@ }, { "ModuleName": "PCPage/项目代码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T15:29:20.6851144+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目代码.rd", - "Pages\\557031284d494486b3b32eb2329c19a.json", - "Pages\\557031284d494486b3b32eb2329c19a.rd", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.json", - "Pages\\cb2a6325e1334f5fbcb7270deba57ec.rd" - ] + "ModuleType": 1 }, { "ModuleName": "image/登录方式", @@ -2249,22 +2042,10 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T14:47:19.5348121+08:00", "ModuleType": 15 }, { "ModuleName": "TaskScheduler/仓库新增事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T16:10:50.9259771+08:00", "ModuleType": 16 } ] \ No newline at end of file diff --git a/Pages/557031284d494486b3b32eb2329c19a.json b/Pages/557031284d494486b3b32eb2329c19a.json index 9585a642..672cacf7 100644 --- a/Pages/557031284d494486b3b32eb2329c19a.json +++ b/Pages/557031284d494486b3b32eb2329c19a.json @@ -6,6 +6,11 @@ "DesignLengthInPixel": 15.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 6.0 @@ -21,11 +26,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "Count": 5, @@ -55,15 +55,15 @@ } } }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 48.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } } }, "Count": 5, @@ -228,4 +228,4 @@ "Size": "15,15" } ] -}//fJt+QG2VPqsFJIRY7mlTKKOe1832dBXGEy9txVQaDuOWB5mshjeWAX0Fna34GdfFrSvRJX7AyjjWPwaI9wmZkLy9nAeGSjlC5ZCK25Mo/7lUmona1BPrVHNtKqG2xGJJlggzTIdX7LQA3Ejf3VRPbNVoYScoTlmFmSeakEVeZ+1Gs2e2UpqR4ELDGmOl7R/fItPOeCy4OPQEsk2ETfIXHXzAk+CWVJnfbv5MpGpgnrk3ke7REYzBZMo43zw/9qAQ8H6qsp6g1VdU+95LW8aWxOUd0edorQEB0YYjRYaPncaiDs6zC5Y5FprK0P7cMjXsDCV3nnjiYohJkrTkcz+nepUPDLdOlRG19LWgxM2aTTJ8YWCFFm4QvMOh0+1cSyhHnxgnVSQt0kkgLxASRP/Y6B9BZJal80r77C+v/ryKQAqfqh4/0ZyRduibbR6mqHWb1tuP9A4hmJq/GqbT9SxF7jjlJpvh3gT2cXJejgb3DTNK4CvuAAkrFYbWnXAkGNyYPvfPdErCf+vNqoZk/tHkxAeQSz+q1Wo8ySU/kh+H4O/EMMbaRYPNKPGw05xwkO7fjDu9hiSzDnuyEQQ+q+q32hAcQGPSKNxC2hV6ePTUeDoz0qkTQ6zgjJCQrGCY37UmTNqK63XEhMOq0zP3epGEyxF3XlGhEWb7sVI3ZFHDCGclf+mPxUA05wZSjs6kYjlKgsY705Uaux5q73aMLz1cpQsi/9CCrcyLHg0fku1pHme+TtAtrX6HI+v/RZ8yos0nKoiCyjOQl2K0mB2gHC8RnmxPtrI3bfVYaTBk2o6ANAleAAqRaodteNngbLyFYEHWcTNzYKcxQ11L3e/eYSuEfPw9TtJhdbXmYZEd3OW2RbFS57BtX6W5QrVBQ4Fsa9cE5dXiQiNYRtI8FyiIW7Xpog==|920 \ No newline at end of file +}//+BAylswERSQoVaWtxD5b2ceBtJtt8RQt9yHMNgiugnys3dePXcLwsqDINh1MIPlbak8xnx3qwr+tIIG/uzw70QwGiYIbqrBzsOp9SeHIl1sIdyBaxDiD8qO0gNpA/pDlY5Rvr8gntSYDh+QgSFHXDychZ59luphWA+xTQWZ/8BnHsdNILXT5PzYNEfdIRCdw1JD5YPEKt4M/o8/dgA+LGVFbYzjURea2rZJlwEfEerSSI+n6GVVXjgqy+Z63noPnmAGs8RR/PY/uF3BqirtAJ/WLhHg0MrYdNhdx/kC6QPWU7tzDAuIftSF7/2OCyrHug7ykPHsUKBDE7/hKvfVylT8Eh5hmajPfR8lzSdX315PEOuxGmeKIPz+e+qqV5C9H8rlihjzqb5ZuMA+7LxowXvLGJ42Hqa7MW1uD+uT7Cl46EOi26SNhYxOpTQu+E8nfn5M/BPf3plW5LesearMUug2b1k09k0ieLbyjpIFX2qFpFgIi3uxNObX/FqzJ+F+iurJqUDjfWVIaBoeroNxbL/Ev2xFl+Og3xRgfVWTRbCkTTkOA4O0GIprIFhidsIcAtMkrUwmbKl6xDlTCqr5sj49DGuWJfhk4v0/pjk1WFC/CwOd/bFCiIFSgZVehI5k6e6gLOLxZbfmjJwCp9yY96OxJs040v/HDwMfV6H0AkrjIrnaFP/cmbc12gKux69/B/o2teH6FmUTW1By4CGHPL0fXcT5swkiM4kVvwdIgwzufakaS0k2tc4EEtMDfm/7QL1BB2K20zGKaQblupOPgI3CB2Vvcad2BavgiYSAovL9bR6Yt0XJJ0cE3zFaKRI6H+8qV3PCQix3pnWXaEYmASI9cQAqabYpcqt0C9AUj9L+90OzkIDD3lrAaWPr/pv3i20b+7yXecF9BUfNczDauWg==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 8530e51a..e09dce3a 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "a169e445-d5a8-4902-8027-247010f8d57e" + "ID": "cf51b303-98e2-4fac-9e54-65d82a329b53" }, { "CommandList": [ @@ -157,12 +157,12 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "7a6b186e-3d6d-405d-ab0b-f1b799ef2c11" + "ID": "828cc793-4b72-4c51-a1a8-61a343e0b9c5" } ] } ], - "ID": "5ed65a13-9163-401e-8570-b303af45843c" + "ID": "ad06eaec-e5c4-4c9c-9be3-6e91dbd3e114" } ] } @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//k30K1JeNUEDOKpUtJxuw8Us7qjBRiokKoJJlthINZtlFr4zV6dtQS5JHCGvhhmXTPZFXB8fOE/O+NgzjtdBpBKvdBqsUIricPlQO1/6/GZPcINUFjF96SpklBbSlHW1hJvdisVKBHasbuHmmraA53l3Z2w8hR9qd/ewP3sM0htK7uTHQ20yKoD4hoUWrQsyc3527YK3Zm+lQzpUeh/+JXWdijnc0QW55cNeMHr5qN28VwEbhaHsOR2bBTyArjoulb5Dp1IQNHmNtiyUQarNNkKvQ2nPo27wtyCxFZDM5SEwGRSIVDk3LBHIfYKPyFkNEBH0h9NGhkz/mTvfEC3gkbL09BfCon5IuetK9iOdbKOzkBqIWMZzPMK6t2L6j94628ZRBcnuYg/MF5J9Axm+ZZQK4RuqnBjZqgYWaKQ3XPos6zGekOSjdyWCwRffalGlkXjopEg3tKQYa9UBv5AeBUycSJO0msSy89yGhbYeexUDVf8ZBdWuWhhnE70nAtRZUccO0YaDyjwnzx7NofvEhT0MdnvtPw5CtBXhE6vBAY6OSFAN+UQzeHkO+InG2WfFpZoLmRRUD8ptXq7XZMVKsEmU7gJ6aDY7HyLt26Kb2Weq2auYmN3FbASv9y4rtIBUCVXZGEkFC/NPNnWFiSCtXO7njyLay5prp4bRZFWkLINbV/FntEkqrcURJHY4SM5hj5k3Jvutg05obc4AocApJ/JZreToW1emvx4VlNJhQCSOVscNg1ZI0RrZLL8Pi0fXBR+IqEtt8Q4Vpnt4JQ3VxWWCR+6bNZvf/xilvoB8MV9XtmBK5scgFmdvyDC8vl3M7Pp0t1BTSEtj5+g2HbafSEMEO4USSuJHGjHUqn/Hb3DtjcusCDh3bPPTk2quXohPCDqX8ZNlFNl5YtD3Giv4Ssw==|920 \ No newline at end of file +}//X0m+9rpNvArdcumgB5+mShKnHL97omIkgzeqZPz6fWfUnSVdz76n6LtPjjBSuK54FdnSDBDjmcOvLQIpRlelN2NoC2VcLUmJ1eHQYs+7ZTIgB8qp+Jv4Kjm5G01wsIxa333/ijdFPn0BawFfsmGCiHDCF2TYyIpHGQ3V4rcRcLVaYRan/oljtkN9MY+mX0u98NMulJqWXNLM/nuxYoGJuhBbYD45ol7dgWyeZXle9tjcMutA+N5b19gZk8hRHqKGu2UBn8ayVE90YKkEwzTYJvh0/aLKq71C/rNkqcobRPz3k5saEEsuI38NAcDyQefmFSwT207VsHlVq8njZ8UbrmQSkRR5Nw7KIp3YDwajMPhRpT7FQkumhFUH0m583NNQxkvVXmVG+EAIJxfrUHl0aQh1HQpHjnRUNfRUvfCa+Y6QTnfUkonaP+oI8c0y0K3iO5Y1keYoKR6GLCeIX+PqNxUVsMJBPFaNZnCD4wzbiluCfFpR/Nxzrc9IJvaiQ23K/e1yQ0izpJZ+IjqfPz4BPp/8gWwKtSmz0yqoUd3hRA9r1EVsb6hYgtKzLLRuPOrCTic70z5Bi8Tb7YBudvEQfSLlm/svfdI/PrEJRxfkbTnYueP9yN1c/9CcRFUU3q0z0QxJ80ySpyL6Yfkip1ybwqEKhbkalxAu1talmvxJUrT5XvM4f57Ssw+emynvgu21gfD+/C0hEULsMcZAWTAlhNflZsxZacAFRP8XEslxkVpVLIig75PDqalsXLrrCEYEXgyTfZ4JP/zTaVuPVblHRzaK76N2kGkFxlY+AhKQaPsg7GvDY2cAo02Drnpbke3cnLzMugmHXbyhJKdiwq4cbv/DJoMbdxQGK1tCt4BzAtnu2nuAJKmWS2x3l8Y6djCnlX23Rm+rO6KF+a8/AKMZvw==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index e950f752..039996ce 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -18,8 +18,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0, - "IsHidden": true + "DesignLengthInPixel": 21.0 } } }, @@ -69,7 +68,7 @@ }, "Values": { "1,1": "😊", - "1,2": "分组名称" + "1,2": "所有分组" }, "AttachInfos": { "1,1": { @@ -155,7 +154,7 @@ ] } ], - "ID": "546eb059-bba5-4c48-8f11-b321521beeee" + "ID": "5aabeacc-99aa-46e0-bc46-d8403e879e09" } ] } @@ -229,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "20ee9916-c4c1-4bc2-9af7-8efbe68e602d" + "ID": "25d61e60-e4d5-4ecd-9059-0de8b4761d65" }, { "Condition": { @@ -259,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "d3fbf457-8b52-486b-aca6-df17750a1d32" + "ID": "e2a1d1b4-2404-4e84-8122-3fefa7e43349" }, { "Condition": { @@ -336,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "9c95643e-ec81-4492-8c2f-b354dd7577d4" + "ID": "2e0de9ad-c2b8-4ea3-92ac-39adf7788a2d" }, { "CommandList": [ @@ -351,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "c22cae4b-b0f9-4da5-9ee4-d054a2c5cd10" + "ID": "7de33e7b-a95c-4a5f-a30e-d8c3a4313c49" } ] } ], - "ID": "64ec9595-470a-409d-8837-95df485a3028" + "ID": "3f652702-db27-4ec9-9d05-3a27d47b4e6e" } ] } ], - "ID": "131261e9-9610-4ba7-8d32-12a6c779d345" + "ID": "414212fe-00c3-458c-b53d-c0ae1fbcb199" } ] } @@ -377,7 +376,10 @@ "Size": 20, "ImagePath": "更多.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "9cfc4dcd-c717-4754-9bfc-b0ecc1ab4511" + ] }, "3,2": { "TemplateCellSource": "ID" @@ -417,7 +419,24 @@ }, "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "任务列表" + "ParentPageName": "任务列表", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=a3c94948c8a24e6a9d63fc05ebfd71f!$C$4=\"\"" + }, + "GUID": "9cfc4dcd-c717-4754-9bfc-b0ecc1ab4511", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -436,4 +455,4 @@ "Size": "24,24" } ] -}//vnoUvkRLeYD/w8aFCBCW9rr7D0gHQ5wVOL1ipBkdfFE8YZmVFaV7sdFQLqoGoa3BrNe6RbAxusBzH1wohYbAePM+oXWZlYkrD7LzRKRUSkn5BVNGT/74SV9xAIBM1X4XA3zoQgC5zvSi5ybXyTSU8IZuPaGIVYFmIki4bne651xdBYFqhFJFWI+4pPnr9u64DFClYLfQSamtt/FiuJZMqe4Wqu/6+UArbFJQ9FABc6Gd2zHIZBnygJAU+9wfkYo/ooGtm2/mX/+rYRDX9DHa1iCMLrYX0qY+hoFr08v5EBwtrv1ovKCLpp+lPrUwvNLDUGMknKxppiWV/xQG24t/eJViLH8BOpWbMZM4M6MKrXE2FaMHBl+0HR4s19fh1jPqhutXqA26OH3jWyR/vhwxIOu42XjKo9DKOU/cILYndW28GuN0K/p4LFbmT15NOQV6zT2IQw0CMQZL2SgL6rTQaKh1RSC0NoNj5RisMnnH5qVzNPcnWr0+fhVBtayhSofIQiWhWODXdHlKN9WIHMdUfI4XnHk7mCIh4xmLyk0UfNnTe8Y3Kz/RThSkSXgSMalZG27707TU0+NQP3rLfNsEkqHRG1I+MLFRVcZQq+J7iY2aropDCyPpjUO+6bMDmCUXIkhnsEPFf4OG8C1/5YEUndFiHog0sORwtP/s28GCUhnbZDYO7quNk33Ih4mnkvriYCCV8/NtiBgmn9EfEsb9SUL9ODKSoYg/LOsD9D111E8peS09wBt3D8/jzPL5RJhxII/HvT1STtUFR1cqBn/0Rg18Wb1PFHr3jSrlxvrbQC1umhwX4TcpNfJ39IkIFQwYgB8BoDsy8NShcbbK/sycVHJxOPd6xxZcJeqcLtdUkyNT1S2GSOn2TGKj2TFCpluLbHXPuM7SbGW3AHnDJMYjoQ==|920 \ No newline at end of file +}//P0mjxv/7G/mavUECp3s3Z5oyqJ1Uo2T8myvd9/wdp2JS8YuMikzRvrzOKcYj/U6IwRYkcPhebJy04qj4q18l+UtkKr2pWtL80vWapDpoWss+OeLIxZAbh7VGfSWAOrZGOvBN73ytq5+dDcDxzMvzxLT/d8gf7C1qnn4IHf1bFT2GQXA4MvP9MFWRw0JP2m8DnDYik2eGyyYPSpjkJAbwmO9CXEF4zehV6jLbrm1+P+6iuMnxAtFEfN3xPSr+DhG7MuNTPMrosKLhAWX5wVIhX5M+F2MgaSbeCIIjSwEHSnnwAeM9y3109aeQgGvMzp8GIo/6024qiKq8zua0YT26UgA+BGGRAc6CDNLB/dcdvCj/RISlaoBsyZZRkJPNENY/w+tQhah0hRw4rG8TFwGW329KBVv4z1eQqIZffqhJP8g2jeEA/UptRN48g+kM3TXihyD81b7AdsN152tpb4OScLiL3M8YQhkJ9a7CAUbZbk6CLkEtRvUzVSiyf35H+zXifOQa8xI2RSPLKKTtrtBzleNRlzVDocDiuPKa/h8NKpxCxx60H1rp4daKORJsbuxXYhvGTqcNj53x+Wmt2f5jKRSXWXF4Z/m4S/REJOPXEAoAtj5AnQ5953N5x94TcgunI0OY8NTqzvcQzl760h11XGznxwSJ5Num6zbEfrCwBYM4MB0UOP6T2wJZnTPjqoBSi3iervWBri83inT4j61O/lSkNBdcFBddqMAduyWko7rq/6ED6EPedhulaQCt2us/NUIPZV/09MrwBUgmWvG3nKj4DIqJvbuGZfmCoSEFPp/ekMdwwUZSjaICkv6PVTsGiLnkuBOj+WRZMQcMvIQO2vXVeQvQvfJYvVa/Vq0mhK+D/KEGuhXTiXIfQn5pB8d7RR5tSbNFSVrlZwJCY3/L+w==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json index 0db08a12..c66641ec 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.json +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.json @@ -33,16 +33,33 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "Mode": 1 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 28.0, + "IsHidden": true + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, - "Count": 8, + "InLogicalVisibleIndexes": [ + 7, + 9 + ], + "Count": 10, "DefaultSize": 16.0 }, "Cols": { @@ -99,8 +116,7 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 53.0, - "Mode": 1 + "DesignLengthInPixel": 74.0 } }, "11": { @@ -116,7 +132,8 @@ "1,1": "版本号", "1,10": "创建人", "3,2": "空间名称/仓库名称", - "3,9": "master" + "3,9": "master", + "7,5": "立即绑定" }, "AttachInfos": { "1,1": { @@ -125,12 +142,19 @@ "1,9": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "TemplateKey": "圆形" + "TemplateKey": "圆形", + "ImagePath": "默认头像 .png" }, - "TemplateCellSource": "创建人头像" + "TemplateCellSource": "创建人头像", + "RulesGuidList": [ + "1db67ca9-ca8f-4621-8730-b7daa0920e07" + ] }, "1,10": { - "TemplateCellSource": "创建人" + "TemplateCellSource": "创建人", + "RulesGuidList": [ + "1db67ca9-ca8f-4621-8730-b7daa0920e07" + ] }, "3,1": { "CellType": { @@ -140,7 +164,7 @@ } }, "3,2": { - "TemplateCellSource": "空间和仓库名" + "TemplateCellSource": "副标题" }, "3,9": { "TemplateCellSource": "分支名称" @@ -187,6 +211,65 @@ "ReadOnly": true }, "TemplateCellSource": "仓库成员" + }, + "7,5": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "任务版本详情", + "LoadBindingDataOption": 1 + } + ], + "Text": "立即绑定", + "TemplateKey": "_RS_Success3", + "Icon": { + "Name": "git-branch.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 12.0 + } + }, + "9,2": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!3:4,cb2a6325e1334f5fbcb7270deba57ec!7:7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(cb2a6325e1334f5fbcb7270deba57ec!C10=\"\")" + } + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!8:8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!C10=\"\"" + } + } + ] + } + ] + }, + "TemplateCellSource": "仓库ID" } }, "StyleDatas": { @@ -233,6 +316,14 @@ "FontSize": 12.0, "Foreground": 2, "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 12.0, + "HorizontalAlignment": 9 + }, + { + "Formatter": 10 } ], "Types": { @@ -245,7 +336,9 @@ "Left", "Accent 1 0", "Right", - "Background 1 -5" + "Background 1 -5", + "Center", + "@" ], "Borders": [ { @@ -259,12 +352,6 @@ "1,10": 2, "2,2": 3, "3,2": 4, - "3,3": 1, - "3,4": 1, - "3,5": 1, - "3,6": 1, - "3,7": 1, - "3,8": 1, "3,9": 5, "3,10": 1, "4,1": 6, @@ -277,7 +364,27 @@ "4,8": 6, "4,9": 6, "4,10": 6, - "6,1": 7 + "6,1": 7, + "7,1": 7, + "7,2": 7, + "7,3": 7, + "7,5": 8, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 7, + "7,10": 7, + "8,1": 7, + "8,2": 7, + "8,3": 7, + "8,4": 8, + "8,5": 8, + "8,6": 8, + "8,7": 8, + "8,8": 7, + "8,9": 7, + "8,10": 7, + "9,2": 9 }, "SheetStyle": { "FontFamily": 0 @@ -287,14 +394,35 @@ "1,1,1,7", "3,9,1,2", "6,1,1,10", - "3,2,1,7" + "3,2,1,7", + "7,5,1,4", + "9,2,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "项目代码" + "ParentPageName": "项目代码", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$K$2=\"\"" + }, + "GUID": "1db67ca9-ca8f-4621-8730-b7daa0920e07", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": true, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//LOcWpgYk3O1n7RtX2WZRulOh5NUX7IVzGqJTTlajFmqikRioc2CxMLbW/Z9fKW7I1qz+o+yt1gIiuQCxukkL8oVkOBj6HoM6RYm7lLCRD6GPhG5Z1wsbZiSMjh5CCYGkNUxGlRDjYHcaeNTm5ARVt69KRNqEpEAGkk77WI/GpWzKiNmOfiVzE5nZsMB5YuFpLyAzvMle1eSlVSgsjiuPm0u6YQRS5wJokYlD0ryZRKxRyMULLTnuqvmkhJR4aD1zjmOpZETm/tshhL/I8Wxvx91XtCA8BbYnKiPybCg/Yaz3pcBhTBr17ASpaY1J0S8p72e6kolIVECwD5nZdbfy0sQrXkXnBbUwN0HiWEoLI8tySS1SQugJxpw4oX9RiQQAQB3BIzUNIEBtEhIFQCTJk26QCgZVNk+Z6SFayFNDn+6CkfzZ/G/0ietmhDb1xuB7GhTH+UvJqEydCZw6L1ia4RILMVaEfxV7Xhdp7hBYYodlYIdPBqHbXVgvVhRA9fWJQTBqVuNXJu8We4fxO7PSr8w4u/RoVCB1NrcMYepHGhkF8EA/tQdaugRP+gKjSLtwCR1nE4DwX4SQ9JaPuOBLnuX2L3l8/hKJFa1wUpVjgYCl3YsCqDbI8R6E7kUhhLt7oMCm7C4tOrGBzjQWfcuivxJTSFGQgVIMv1paQOrwZnExLeXGNq9R3GDac56PUQpq4roWoSLP6kWoiSW5SECCFaOaVoUpY1mOseKf/4ui+bS1Uv/3wE0CorcYNCdtcRFYvQrJriheioY9h1UvrNRKwQJMgd0Z5eUB7cfQF5Sb+lquarCcxzuKfqt5V+SjhlgPZnXj5FqW/uof46MWzqTwifnlGMPRxaVg328/0YXOER7ru+WdRTtZQTgKbfCbm+AFh5AyBrBxYoyJ/d2H3KbnHg==|920 \ No newline at end of file +}//7XbPWQf0nIw9bVQ0cRCmXbuLtYj2ffSwXiaqL6r1nXEjd020N5YtCiV+pwhBPivB160Og3V2Wozhi64yF60DI6EsBR5tMdMM5LC9NRsK5/+L67y2KR6ztHINKHHa4Ih064zbajAH5YbtNjnsLatSfS/xwGPgJjDJoGFb5VqSYno6QyvxgrSyAenRLFBATqMsYW28Q1wxcHeHPBDH+4PKyDrIS154oQay0SVH6Ekz9IzDzxMF34P8QTN4X5KZ/m+tTN2hVwQ88lRzHuuWIb9WB0M6Olgy5cllJT6G9TlJK4HzTlP/LV2N8aRtgkVhk8o8xrEddGgvvKJZffswtBajiTu8SW17sPhFoaW4Gkg7ct2VW9A7qs9V/kCfvacRmXze1ubF0mDRjFLIzcKWQE/AZAhLQdzMqpKS57XhyYFEoLScvJrNkD1qo4cTuur4Kar+Iwd1IVMT6xMbhKcCor4WV4yCE2dbvRltZlDwekwROOMd9lacgtoAqu7wLawLt7kSYXk7DIWjn0lgaQ0vYXbQXhoidpgEHJfIVFkeSfw7qQSK/8lsG1YvnuU/r2PajP7x8rJJd8zWYkbT0XlxgDB5/1C/lV6YWZwpvtESq8MhPMLAIGYEToBcz0o1Jhp9P3psVys1sHdKJ6YV3oh9ZluZlD3Tf8qmAMrr7GCaspq+Wn+3fff9YNIw/w4glm2K4s3pq1AG1rMzVnpGqe0kWWUkiQMT0UqF5lQcWP0UhAfPJ09JlKgY3xuTF5m7dZWjHlA7x3NOWZPwvReNZliAbNM4eIIMbblfTmmU2HMFs51amzfMU+H+IZbib7J7JfwMUOtruhuY4DpB6unwyfrsbMuzMgKec31FpdqTrds5UcZ8iORIyUOruR7Tadaa6j53Nq1LsaCIAUXLu6OQPKHEUFlz9w==|920 \ No newline at end of file diff --git a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd index fb0c08aa..637c3dca 100644 --- a/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd +++ b/Pages/cb2a6325e1334f5fbcb7270deba57ec.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 12, - "RowCount": 8 + "RowCount": 10 } \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 9e53aa94..cb210d68 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -227,7 +227,7 @@ "ShowConfirm": false } ], - "ID": "01c7ea01-723b-4884-8106-8944fe16dd00" + "ID": "51a7b6dd-68d0-425c-8d78-9afb85c8e8d4" } ] } @@ -355,7 +355,7 @@ } } ], - "ID": "96a7c725-2eec-40dc-b50e-24e2d0bac281" + "ID": "b8b5cd56-edf8-49fd-b78d-1f221daeb176" }, { "CommandList": [ @@ -370,12 +370,12 @@ "BtnText": "知道了" } ], - "ID": "10a55ff4-a568-47c7-9211-aa27b4116197" + "ID": "8c0b29ab-9f46-4d34-8ee2-5fe4cd2ae0a8" } ] } ], - "ID": "1e53f846-0adc-4b61-ba78-02eb4d65a6c5" + "ID": "b491b316-7608-4cea-9105-845a73281194" } ] } @@ -388,7 +388,7 @@ } ], "Comments": "小于进行中", - "ID": "e79787f4-180d-4d8c-80a9-18eb1e91ea40" + "ID": "2829596d-d562-4cde-9e55-098d163c6dee" }, { "CommandList": [ @@ -398,7 +398,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "22b31bd9-37b4-446a-b032-eaf69d4817b8" + "ID": "9423736f-5504-4ec8-8c41-4a3269db64b7" } ] } @@ -476,7 +476,7 @@ ] } ], - "ID": "13e15609-1a35-4a39-b7c9-de9623dee8c7" + "ID": "d3422ff0-5cea-44ac-b21c-30c0a5b60fc4" } ] } @@ -617,7 +617,7 @@ ] } ], - "ID": "0af7adb0-1077-4b53-ac16-faa4f7e4e270" + "ID": "7d5fab47-6f96-4d69-9261-321acf6e4d12" } ] } @@ -725,7 +725,7 @@ "ShowConfirm": false } ], - "ID": "95c2466e-3d6d-4121-b9c8-30d50d2bbecc" + "ID": "68b2b2d2-6672-4f38-abcb-3750b106ce00" } ] } @@ -762,7 +762,7 @@ "ShowConfirm": false } ], - "ID": "7d84fbea-6534-4cdc-ae6b-0a3c70496b5d" + "ID": "6c7ce6cb-a701-416d-969d-e16fed947611" } ] } @@ -897,7 +897,7 @@ ] } ], - "ID": "10834e1b-dde0-4c30-a344-74d72b42b4c6" + "ID": "d5066fa8-d506-4b00-8861-9cf91d5c9e92" } ] } @@ -1066,7 +1066,7 @@ ] } ], - "ID": "ed6379cc-a4fd-42d9-8d28-bdd831642e44" + "ID": "93d9ed27-3fcc-4866-92f2-f63857247cbc" } ] } @@ -1214,7 +1214,7 @@ "BtnText": "知道了" } ], - "ID": "c277491c-62f2-468e-9bab-489cbd181b90" + "ID": "c2139fa3-327c-4b89-83b6-81f1159a6247" } ] }, @@ -1228,7 +1228,7 @@ "Title": "计算中" } ], - "ID": "99e73a43-9bbe-4d9e-9b4d-2282ed361491" + "ID": "ad514b07-8350-4f76-872e-a28fdbe4870c" }, { "CommandList": [ @@ -1238,12 +1238,12 @@ "ShowConfirm": false } ], - "ID": "72d8c83f-7a58-4691-9f10-af03b88669df" + "ID": "29864c08-3e7f-489a-868e-3da238416d6c" } ] } ], - "ID": "7b1217ff-f417-4cf4-b8be-6dcafe5065a0" + "ID": "edb8a9cb-a399-4b59-b330-a90c971787d2" } ] } @@ -1621,4 +1621,4 @@ "Formula": "'任务-基本信息'!$B$2" } ] -}//xYvD0RcYj5D20EUb43UfWjoNYEhrQYRqhq8Ceg0qwi2ae3WIY1vjFmvv2oEd5cyqS2yWqNC5kRGoU7hiUmoJ0lNIHafvONH1w3ZUMkhtaLGCEW0fOwnfRbInD2qJhoDkSQccaWGu08+nYBVwMnh4qSmqya04EnFqQgOuFRTMtGDdYrbSH4H3IdCdu5oVeeshMtekGUdaG9u1rV9Au+LBngI2cW01NNLIC/miScKieMMjB7WaW8Gy1BP11QJ5QboJHQzCvgKfjTRaWYQGoWO8yOhJg9/Ba/Zk3PHpeYfIDgpdkYWUMCIBaiLrzq6BbqlEPmglL022jGAt4h9iTBr1A4ikBuiUs7p2b2hW7SlGp7bsA3QgnkSBl6T4AhBDYb6WfFf9qun6Fy4VU5qsFSfzwS/5yMtMkm+dzuVPi2hsTkYgI2C59GosOBDp5+LlYy3LbSK1dLliQOFKv3NBOhF0gbyuww+rto+1jynAME0oHmZjdjPSnxhGnp/6+HYYrRq2FxRf6qG7c4jUZhfXsouGv3sLBQBj5wB7URsHLRh7vgk1FE7y9JS4mqMmAETR4dGxc+pZN72rveYB0eMpyNReQc1MUxFQTvoH8X2WH8+hKj1o+2U+FSPqRceJKPQAXIyXV33R53s3uMHf+5mldTb1n7iK8oSqMHhBRm0nmxFyX9iP9JFac5Ikp0jMUyRsgQmnkmbOMnJbYprmynrzmb7E77IIItG/Mnbgkw9n6UXIQX78uhe6WlyGh5fCFcgF2T/sxmSahfgURv6LTZSwSbl5fIEqxcvxYQZlUUR0ngq1gN4djHtE5/CtH5woxN1T65akyoQDuHhl0/pKJT33Gp3voyK3eRLDNmrpxgtSQoZiagjM3oqCP4UkIBj+T8SF8VyoYW5TVBz/s7NZkJcz4MAjsg==|920 \ No newline at end of file +}//2xfWeJmwd1ewjAIeRiY9jgyUjMSEWVu2lftBwWTrw1ucdt7myCBeI7GYH+B8vHpXzTIl5duqWBn4n1+Bwkt5Hh3EliS0AH3iGbLVSHYwlO/N3YIqHah8Xisu3q1THjvZLEm1XiIR4+RQseDSH3w120jR2oQQD6tTPwiLsOYRxMQTp5H6nlFKNtf0hLQKjLw4KF26sVbDKa5l2YCj7Sc3CrFvhvj4R7MoKcr+FE48J6VjuHvo6MQumJp/bAopPRA+dy+G7BMBUO6NE5LYfBk/VlgGdWkjPVPQYCMCdg1/BAKtrF6OEw1qLVrviyosXv0dsDryu1SYJfP6/ALlalYzNUUE6UsqR2eEdwixYgV16BRfyR5Eg5kdkT92aVU4T//VLDIUt0HNUAZoel2EVrTcTznt7vfPJIXYFOp2dfhmZMNM8Pm9rk/5wHL5+je8ZEfSKpbBQfV+OD/xZOy3KAr6481cD55tCyTQou6TW6UT37C9EKn975gu0mYb0KpHZ6Hy9dmCBwYjF0GSas9yYoPWNA28/b73ViEL22eL+1wEDlkqImAbTyrxv8RXuGRBO5fRsyvJdTjkntE1lA1PU3PIj7HiIsoPbVtAxBoN3ahvoRpJ1wBdUnVK6FvBZBoiS2LXU9zZuQ6ykNXj5wBI3m2oDYpKJbhWXqBmnNZpI+iUWkSQ2u2Xu9aGsS6AU/SDVDomlLhjjJRfM3WMFavqLICXPG5WpyRKAOvydcmMjNDoX+eL8svpLzuP9w/BU3liTwnZmUhoCrKngEF7Bn0FYHy0Gqga2/TCzvGFkjHjLrEZlxHlORcGvGQ8/ExrOOrVSlk8UjuC1M+hbUZCsjJoxqkMp4tNDXlAdk91SkfxwiwlGAo6e18dumrAXrHn9gc1wMetwJYlTwhsdLXDmMKvK19qVw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index c6ae50c5..2fa4ed3a 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -153,62 +153,96 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增任务", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!项目ID" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "d1f5930b-e3e2-439f-97c8-9e507d0b2042" + } + }, + "value": "2" }, - "TargetCell": { - "SerializeProperty": "=新增任务!项目ID" - } + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "新增任务", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!项目ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!任务ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!父任务ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!C6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!任务类型" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!F6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!任务分组" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!I6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!任务版本" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!L6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!任务负责人" + } + } + ] + } + ], + "ID": "27506fa9-b535-4ce2-9eac-76d6e89d98e5" }, { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!任务ID" - }, - "TargetCell": { - "SerializeProperty": "=新增任务!父任务ID" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!C6" - }, - "TargetCell": { - "SerializeProperty": "=新增任务!任务类型" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!F6" - }, - "TargetCell": { - "SerializeProperty": "=新增任务!任务分组" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!I6" - }, - "TargetCell": { - "SerializeProperty": "=新增任务!任务版本" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!L6" - }, - "TargetCell": { - "SerializeProperty": "=新增任务!任务负责人" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "当前任务状态不允许新增子任务" + } + ], + "ID": "7168082e-8d57-470b-84d3-ad0374e8b467" } ] } @@ -338,23 +372,18 @@ "ColumnName": "任务状态" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "子任务视图", - "ColumnName": "父任务ID", - "GUID": "39e8e6ab-9c57-4528-b057-92d7f07a764d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!任务ID" - } - }, "IsListviewDataSource": true, "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格1", "TemplateKey": "竖排无样式", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "父任务ID", + "MasterTable": "任务表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + }, "CommitDataWithCommand": true } }, @@ -524,7 +553,6 @@ "5,8": 4, "5,11": 4, "5,14": 4, - "5,15": 4, "5,16": 4, "5,17": 4, "5,20": 4 @@ -544,7 +572,8 @@ "5,5,1,3", "5,8,1,3", "5,11,1,3", - "1,17,1,3" + "1,17,1,3", + "5,14,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -619,4 +648,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//CwuLhplzw3I6ZQmoFfOKTC/tVcrZKLjHDUD9VRExbj8+7Izzf310iqnLherPN1njRXJbEdVaTANSGEGCSDJOlqQpvSs8whY63a6iXLtXUcrQ2vwjDF+MaeszG1o9ufOSoqymoMq0yfPEb0pV6qP+EKzLmi/PN91MqLbGz6PiOlpdbT3jxLwWZ8RnmKZbtpE3+51bhYMO6D25XyXRF9bAOO1VU6PVokzb4lzFalj1vMU/igJv3NO/srWIsz8blIK1x8AMiCop+V0zB5euXi0LkVAaRm2vBu0esz2dSKYwv6bnq45oFEf/mfrjaLRCptbsO6UQPUy5puKkqsXudQ7Tg7xrvcd2TUWF6S57gI2rucDVi9SvTsUYK92w3tfxN8/P4p1TgpmyksZju7VEDW8AJqYSA5p2GOV+7iZ6IE7L19MKseP0a/En+J1q32ln6YlNMeb00jpaLacQhmHg9QOrf2De/umkUKqRDIHI5lsNmGcHNc0rc084cwDZqbMWmkp+311+Igh29kusTwVsiLDqUN9DDBt0p6jrqqTsxQ53820rWXFKDOCLKsKQs7lvVtAZmUp217kdZT+h8XQYhWA60BwICcVTu8n3YJ17Ki38MaZh6GzT33Bt5aH6Dm3fxJDE9p9AElpzcMVBBguaMrKvUDcO5PPTo+c+rCSAnW8jSpoAy6xCjBnUeamsob6jIloCSSIzAA46jcp1+mJuRGKgG4xSVbZS+6FVtkrhsxqkMxSIIhGD6LqaGUsA2gnvq/kqoj9WFq+JZ/VkRvRAjufrOpTJw3dyMSeWNVWW4bYKo7IuvgYeyZwlnTq2RqJa8mrFyo8Cw0nZ4ssSRJE8k1FOAmS0hZKF0okxKitolw1JHauFR5669AwCp4kc+jbArA8K6IIM+Ms9oLvQcGprY5i97g==|920 \ No newline at end of file +}//ugIm1VK2S1pPZmrliuje/w9teqq8VtVHohY8j4ZzXDYMI6hL8tHonMzS/niqJcw2H2KHJzo589rARmYs5/1l7+iHPuGZyBlZNw9BQqcF/3rzmEiKMnbIqDGIBr8+zH3E1qr0cBg3mh9TO+hWOInAybDU3X1O4eIsJCNKeXDV3KxTw7TgdtH+P1wTT/QbRJCFhFuNaelLpVHa/Fqr5nV3K7RTCoN9Kgd4RY6i/b7GWSM/Rhb9r46OSrKzMxViucmZkzHsK1usyV2DP3RyRkajKO+znUWFj0tBQKxdaW+8Yb69ax//x5KwRPVHK6ZuzPoLgT56XQmzNLzB3P1ipA4UuSaaTsI7v7/9p06GMVUn65Q5DBqd/jgvmDaz/JPFjZXllhVO50s45v1oSWqFliTlDSh23g8i6BewomCZyuJkZgORW/AOJzjGy1pFTP47iW0aDwVcm8bV3ibaYjUJow0eAS5KcfOQNiYcSDF7iHEFC7XqT0Z7T1i64hCnjSkG/30msre1wGPR4z5W3OX061no/YyT1KMqOpGxbACDrVwsoCNYkXNztVBZ4PC4ePdnPdy/z/Ne4P8LhTJO5mr+gQRlhSx988LOvuRT6OZ9WlLqB2Aun1LAjeKjWbiZ2/7AyGX6LIDmPSA1XMAKO1uMPxGAXt4c1oKbermTTtAFL6fvry76p5gqCD6mBoRLPO7N2wXFSlNs5RCNwH/unQIxAoeWvevwQ1Rjh7xB9wx2N1jtiwvNGUGs75MByPbHlnp0Wv2d7Ka/oBnoW/O9syeW6+HJNc3V8WGr8t4zCLuXU4iwuFV9kHqiuR0kVnMyq9+z5JOTAGy3N+8UIOMaVNHgFLoM0Opn3+lAnrvDzwH5qZ2tvdjW7e6eGUhkS1tB9R60Vos1NNl74ZwRNSEtiY9arrxsuA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index 337e3105..6268a3fc 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -315,7 +315,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "c97e4e8b-5dec-4288-9761-b6f4c74b429b" + "ID": "9cf170a8-4ac9-4331-a0f6-9cb4e1c11672" }, { "CommandList": [ @@ -354,12 +354,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "77ee42fc-45dd-4150-88de-889c09466046" + "ID": "460463fa-d8bd-4075-bfbb-2ca3994e853e" } ] } ], - "ID": "7085d01f-329d-4505-99fe-db4b40cfa027" + "ID": "b6d4150f-53aa-47bb-9ae5-150470a65e8e" } ] } @@ -396,7 +396,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "80058c79-33c6-4b3b-9f50-b6512a7167b4" + "ID": "9814dfee-98ad-4f80-9948-738c04fdc77c" }, { "CommandList": [ @@ -435,12 +435,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "9529864c-0468-4d7b-abb4-fe72905a593c" + "ID": "bed5342e-7142-40bf-89b0-f624d41c0293" } ] } ], - "ID": "66cca529-3499-4b16-80ce-a3c806efeaf3" + "ID": "cadd656b-bd10-4070-a652-9f0a2c27adf7" } ] } @@ -493,7 +493,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "6e2c5b12-5400-4887-a213-6ffa2def1a1c" + "ID": "00c59ee6-34fa-441d-89bc-1a86c36d4aae" }, { "CommandList": [ @@ -532,12 +532,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "da200d3f-f244-4c5f-bf85-fabb6c94b7c9" + "ID": "6d1329ae-9bd6-4ecd-acf1-b42ce3877843" } ] } ], - "ID": "dbe134ec-cadf-4caf-af6b-a71ff9b3e6ec" + "ID": "d3f07e60-fe73-412d-ba71-412839af0420" } ] } @@ -560,44 +560,13 @@ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", "tableData": { "TableName": "任务平行视图", - "ColumnName": "成员数量", - "GUID": "6d56483e-74b7-4690-9382-70a314118cca" + "ColumnName": "任务状态", + "GUID": "717883c1-de70-40db-a09d-83b7f942cc38" } }, - "value": "0", - "compareType": 2 + "value": "2" }, "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ - { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } - } - ], - "LoadBindingDataOption": 1 - } - ], - "ID": "0a650300-9647-4bfc-99ea-53fb92e25d08" - }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", - "Message": "该任务尚未添加成员，是否立即添加？", - "Type": "warning", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "ShowClose": false, - "DialogResult": "按钮结果", - "AdvancedSettings": {} - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -605,28 +574,91 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='任务-工时'!按钮结果" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "成员数量", + "GUID": "6d56483e-74b7-4690-9382-70a314118cca" + } }, - "value": "confirm" + "value": "0", + "compareType": 2 }, "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "参与成员管理", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + } + ], "LoadBindingDataOption": 1 } ], - "ID": "d1782cbc-ac80-4465-b355-babb64cf05e5" + "ID": "d9ad2699-d1ed-40ca-a99c-091caa89726c" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员，是否立即添加？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-工时'!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "7ee26078-8f0a-4c90-9613-5d4522e38360" + } + ] + } + ], + "ID": "8bcbceec-0ed0-4840-83ee-f3acf9c1b95d" } ] } ], - "ID": "fa6f5474-12a1-4188-8c5d-f619a809f1a0" + "ID": "f4fcf041-4aa3-44e6-88ca-4feefd3f9a45" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "当前任务状态，允许上报工时" + } + ], + "ID": "e49b92dc-48b3-4332-a0f3-ec671720d15b" } ] } @@ -857,7 +889,7 @@ ] } ], - "ID": "fe722408-692d-467d-ae1b-e8dc730115c2" + "ID": "ecb540a6-e3b0-416d-8bca-58f8500a88f5" }, { "CommandList": [ @@ -877,7 +909,7 @@ ] } ], - "ID": "44d02e26-89d6-4e15-aea8-d342ffa855ab" + "ID": "d724e1e3-94a6-4fe9-9704-40e96081efea" } ] } @@ -1204,4 +1236,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//B0xLCEWMt39SeXYRr1TEbpr2rar4+hn7CwXirqPY0TIsx44UKMS/uUppxYeIryPXZOBTLOuTkYS1WcXz6KenhVDobCsFDYAr2ynL5+gR3ZR0ktQRQvqCWWrIX7nM4PYP/o7wGc6V+5m0I0ByhkzEI4qIZRNQZH4Lf7QMJ/cRhmYHRSnShWBGBsl0bzq9sgZO/iaqXdQNLj9iCdPEjhOm8SiFaVc+GD0PB0oAJJBvvcsVHuy5YmsbwSxEr6i6qvOneDIWZWBzjC3jK/oUnvu+glG3B/yYzoF3j7Vw8uA5RVbZn3oqiVusLRMG3Y852rxNdCPt/1Q2rWjnfoFT7OmcJ4JqRfhomKyGUA1Mqjfh9BHY8LxULhZTQQSKW9sYzPnBS2rSUSsZH936iGHFDHZTzhS5F+wz0j/jrVB/2NGLlg1MT58PiadXx+euBWbA8z6ZxDVYcGb2uUOK6OdjO9j/uylCZuWrWEXyjglWqgZc286lGO+HQc9bJSRtwgZ4VveofCHMHO1w1bAOKgv6C7t7pCHI88HaXaQKZg1lLPIgi23k8isy2JvxwpwpqI/TiALZwH8TttjJF2Nkn4ycePR+xPM3u8ROI7bxd1ABqWbQDsh8LU82TeEM2eMBlAQkvj1IMhaOasmgLcq/AqU6n1Q/Uj9L4UU7S32qm1FPbB5teL9xTNdaDyTTDcotGGwEhEDWzHYaSV6QQXMXnEVXdf6qrOtl6vYBiZPbjXxdmRQfLWNF/5wc1SwqyyEBOjfyfYXlhRDBsOlraF1MUTMeGgWLO2aZeAKe/zut0i16HA/1J1Ps+IQ8q2bRdD0ZcpPKttTePK3fySwUMGV9rsKD5EgnFSjiGx0IJ8Z6xmZu1iErI4m+c2/cETSGGMq7EoTKdnz/mVY6oNUux2r5tfEgM+Omvw==|920 \ No newline at end of file +}//JQPc71PBCD9BMBWCDIse7VTc1DBGR/ymlfA6OXy63dAuy4uRv2fDnXTHcCYDWxklGIve/bTjyEJRJuw5Eoqd9EJvgEKnt/8oBEZI+GWBczZ1x1XAg9PnUlFjnrEUTc2zKtPy5J1KOfZlksavQQMrYqsVGmvGFcm0hydXYjuPZ4y9QbmUAiGM1CxJCUQJF9DSJqGWQqPvDVpuv6AY3pax6qQuWXnJsjTZ7mG9t/KLF9NlsFapp3R8mhIsdFggeNFiFCgXXeRpNc1DWkpDzPqq5MxHec5V2PaEY7LpFqSWGiAABSKVzyrHTcE+WagtcmT7LAAzQQQAUk+Z751ipDGW1m8jfJH4JU2RX9FFBx0j/NeTcAK6OLGRJCEB0pqEb0pKjlbVNGgfROMReg4tCN0jSUL0xSsZ47Q2ER3affOYMWEjah3K0YL5B0XiZ7m3YHrKvtzLJbDr4LK1v9NVrAOvYCWRGJujjWRgKR8ldaIVLhChf5n3ZtT7KnAl80e40mwngJGVLsZbBsu2DXnR6o+DtHGCklvSKYBhnKseTjPqQ3MRuDVi2zfqpn2L62j+zDhn7KKSRDppqW9TnRjzwkFQRJHMdxvZVEqHhywHHYbs3znBHutNWNYUqNtJ6nKKWzkuXjRbkSDgmve7yssN7XrgF9Fn0D9FiZyuvVO+ZVD2nl9HlfWdWF1CfGoodkvZLsX1NXJ2X2vIaaKEIjID++P/OQQqIqLt1WkpOyehuZQMgojLmg7kArZlWvvQbNFdexHw6X0k+ksbr3tTyK/IIJmXj2CpKvknxjU7LXz06LI2qQjMbYesX01pbeVmSmNZrd3/ZySmoZIlIhH8voPOfdNWwygjxpHcBC8wUsDTZMI5M/LHD3y0BZK8w5qAjPTXUBxvpT773ELd01Wpq4SJPemgsQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务部分.json b/Pages/任务/任务部分.json index b45c2815..b66371c5 100644 --- a/Pages/任务/任务部分.json +++ b/Pages/任务/任务部分.json @@ -25,18 +25,21 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 5.0 + "DesignLengthInPixel": 5.0, + "IsHidden": true } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 5.0 + "DesignLengthInPixel": 5.0, + "IsHidden": true } }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 52.0, - "Mode": 1 + "Mode": 1, + "IsHidden": true } }, "7": { @@ -104,6 +107,11 @@ } } }, + "InLogicalVisibleIndexes": [ + 4, + 5, + 6 + ], "Count": 19, "DefaultSize": 5.0 }, @@ -706,10 +714,55 @@ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ { - "$type": "CloseCommand.CloseCommand, CloseCommand", - "PassValueBack": true, - "ReloadData": true, - "PassQueryCondition": true + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "9cfc198e-05b6-4e96-907d-504db33e9079" + } + }, + "value": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!5:7" + }, + "Value": true + } + ] + } + ], + "ID": "4697109e-6c9c-4179-8376-36b1b99154a1" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!5:7" + }, + "Value": false + } + ] + } + ], + "ID": "cfb64db2-78d5-4154-888b-91eb4f5be178" + } + ] }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", @@ -744,4 +797,4 @@ "Formula": "任务部分!$A$1" } ] -}//4FyWMhvyT9N0XvLI9P2dZBZoyBgtMKny7xpUzJ6dt/UGOIDfQCWJeWKkl/cjPWA4skKo2DWQx8JbZ0GX+bgpdhNFICfmGgqS6GW55HIOmZy2fG7aGKXzrIhY3O8cihuosiMrqCoGScS8m++JE4++RIxQp8pIVzC9sOE63uoYJky5OJz8ZrbHizHThSEbJrMXGHON2ZKRzMEc4PSJG9tcZAkU4ijIcjk7EFgYy+t5J79uekF/3DDiWWN2hr4FXRm6zMQAcEziKmNKJv/ym4HkZhUHCcHJUgUkJJPwwpfuH2f/okMCtL1JIjuFWeGHBb4+0obisCLKE3MrLimK3cOyuoyLZKqmgR3KkCDXMIyvI70Jv2RKFNyO6tJtuka7JSrz0BhRWZoKwT3MOzWEDognTN8KhoDe4g57zutpJHzGGX5x1o6J5LrOLC1rhFzupOQxAVbqkoOuUq1V3UxKtKue2yhRomI4uWIyPGqIYH44LUqRtfBy8jGKkGsL9Mctp7BgH42M4BNY31nX/LsvuVKy9ejsJajBxxNTaw/PXxDEe5TY+4DbgoR45PhMfvKzSZIT62wLRVjq9EYto/AzXqfkqICTlEXcPAtHY76ciAttkxyohmtYHYN3vv4HUWdydQdOHKlbSLzIA29sQz1ZuSQuuOMVrK0xYWD/bZXxv5iMw2rYupZ3CRSJwGTz0KxoF+IBC3eltPgen/vhTwLRI8Fq6SeqG7Ya/cO1FnOLUn5/KkIW8zAHdRLbsHRPjTwoQPqbNp9JdyKX23Vs+2o3QIVMdy811eKLU5NP+eenVBq03guEw3QjD10oyx6NIIcsZ9to9mu3CyIwEOJq/YhDcClkVQA5UuqWmyiJ2fVpxaSupfc8maYAjGePfUFNnsGYcdrkIy/eTiXgs0ApA2Pq33Y2AQ==|920 \ No newline at end of file +}//rL8W1m8lENUizVdfeeZcujpp4a8dNbfmgd8630fobvC4WjfmrsAioZzMaK+x6E2N2zQFD1xNjmA0eI6AqeclxXyxQJHGo3w9ieML6/L4Poq9MfLiDlBwqjAwN0Ttsc7Nhp711D2rFJq+26XpmFwqZNGyGnX94No5vRdPWTSxuFob3uHhhgPNEzWl/6IvXb5YdCYojS/DPZ+zoT14KBnaQguU7yKZEcva67EufWZFiyRWELPPIt963gpc37hmvmDhQgnmiqbs7GDzzTBjyjJyXuJeMjxuL1oLwQbQzesXvVcdlI4TKHggUKDJF1gMUR33C5MeIzpmOIxm0lcc9Nmrluc69hOWebTH4H+F3CcmEMSgrQ9ThV7X8k2JqfxnacBVNKcxIBgorb3lZUirWEy9cxUUJ1bNmZlsRBEsEBvFz6LARDXIDRqrEwIFbH64fy7Sog920AgPmVhmQB0FaCkqWUvTuHichdj0gD9kpaeDRrB+oTxRQVJyjVNU5+CdLdUe1wfiYFN5e/uhqLSoGzqCLtwmsvCU0Y8RSCaJhENB6Y7YVhaQLtokQtlaO2ezTTCm74VmOYROOgr29guYFZBR5NKGMESfCP5HPTTIQVNNYgiVQ29dwPgRfmv4FUQ20j97ceUCteBD4w3ifC9OZkTVuh5y2NdWr88bG3/4YtyJ8YEAHFSLSOdbUsOXOnXVAINteIPq7apVhHfm8bibi/7fzrB2S90zVsctayzFGuUDZLuNZmdMVkvOZNzUioTvk1ESLRs5qWbozxw6ArXDW/Yi94CwcuF1wjQAh0CVZaqXNpor/b3x3CqskRNOETyGrVKeh66ezEp7bbY0a9e+6F/LoJFsfHqbljKlNT/hE4jp6rRsRFM4xQHsDansRUqD7ReOWjAvVlf2tIrneH5z4rmI0A==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 450842fa..2eebd93a 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -302,8 +302,7 @@ "ResultMessageTo": { "SerializeProperty": "msg" }, - "RefreshAfterFinish": true, - "CheckDataValidation": true + "CheckDataValidation": false }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -341,7 +340,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "ff901f56-53fa-45c4-9001-cfef1e38f1fe" + "ID": "7d7a077b-3e88-4c52-b75f-40c3b7b41772" } ] } @@ -465,7 +464,7 @@ "PageName": "FGC_审批记录" } ], - "ID": "af1aaa6b-a9e0-434c-8aa5-b45dbcf50e28" + "ID": "7ab673fb-4bb7-49d7-86fd-a34b0b225751" }, { "CommandList": [ @@ -525,7 +524,7 @@ } } ], - "ID": "7cd1c9bd-43f7-4f50-aa4f-386aac072b9b" + "ID": "dc1333ca-ece3-419f-a059-ae77b09643b9" }, { "CommandList": [ @@ -538,12 +537,12 @@ } } ], - "ID": "401991ff-0de5-4dc3-b65e-ca6c5d0a5980" + "ID": "b8064771-8571-467a-b6a6-75d2898ea839" } ] } ], - "ID": "f4ad1336-6398-49bd-9295-ae3f74e5a2b1" + "ID": "0979af3d-8805-43b0-9425-7046db992b7a" } ] } @@ -658,7 +657,7 @@ } } ], - "ID": "6d4edc62-669d-4565-a7cd-c47c99fc44a0" + "ID": "e7e0eb27-5f64-40ba-8a47-7bc7da4b8e2a" } ] }, @@ -699,7 +698,7 @@ } } ], - "ID": "3bf48fea-c043-420c-94f3-e35ad6f7ac6d" + "ID": "cc334536-3b98-4ffb-9340-c8c1c971fc50" } ] } @@ -761,7 +760,7 @@ } } ], - "ID": "28ce3342-5cfc-4a31-bc81-5a07f3ac0f32" + "ID": "1799cd8d-3e55-4fbf-a27b-47d9ddeca313" } ] }, @@ -802,7 +801,7 @@ } } ], - "ID": "1ee58d86-8593-4294-a392-71c18bb6834a" + "ID": "b3b13984-bd90-4d0c-ad27-a906e1a9cbae" } ] } @@ -991,7 +990,8 @@ "Value": "%CurrentUser.UserName%" } ] - } + }, + "Disabled": true }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", @@ -1482,4 +1482,4 @@ "Formula": "任务首页!$S$8" } ] -}//bTi/QJ7Z7HXY2SbxTZCZ1YEOxhXp+Bjp0lP3QgiYohtSWcnaQhBZtPW/wZgjf+wYNyUGdY+Zi2+BI20oSDbapBx9I8BqkDhXWjzaGzcUEljUNW5GW+Aqo55Uk+R4IbuYRqKxKm3JaJ6fdnfZWfvsHkbWsVDXPIREGLeBZvpR12RLsRAYm9w4uTeIaNxWt23JbC4wJp1cfMSmySpXsfB3GOpeNzKQzmWu+oQ2WpSIZRANuEPIIa3RHtEUQd9QWSwcpMILMsroAeftBWVayQUFWKwji3+4gsPk1gztn16h/v5nY4/lGoDRzSk0wOsaBJwl1XR0DIJO8sOXuE2xwckGhCvcqTf6UZ2dnYut2dqlDAfaxCC5/9tEnU/rQn6Nq043Qc4qYz2OztDyQWv/Uz+sXIw60XAUOg482yDq36UF+hu92/cZh4VK2hICagsWyHjOYemKgf8GXQc3ty1bn0VJizW/Rto7kCBY7eEpIPpxEXHWrysAkY7kKm2mnupvb09UP6BLpveWbaBSPISYCbBFyBPDPH5BamASm+aZtLLvzYgRphd0BvUPWHlpDLty/wV03pbv3imaMMG8r2lTU+G5R/H3tocoC80nXODkvGo+eg2DJqZ4ILMMVjWyN+kro26Uqmbx90W0Aw5qtPAWKAl/B2wHHaOJTKZMELbrERGunA7RrNiJf7/Cff5vZmDc58y9+PAdtTNOxD1jV9vNFoUsyROBcbtaFU832mANlqwv7zzkgaJB3JKbi0DFQePN7Lz5uxIIgKnRcWedGCxhhS8iQ+THa2FmuhTUwmuvq47rAWrqsF+5OoZhwwnmHSzUNuy2mHtrx4JAtoAG+ZPDFBdxWgAHIoG9Mqn6bLg4jC7r3pbgy6HTA5uWY2OUJSO2iW3EIekAAIjiwWqhwG67ZdMCUg==|920 \ No newline at end of file +}//cpyfngDPy63Y7rLS4qE76J5jB2gUEZPl7VMuC5lCyK/nUsiYrkHJRJFNkTjFxt9o5Cp0j9q4xmNAwQ2XePHk06NXD1SaP4umSpRwti9rM635JJVKQQKqSHpCMDU9PzqfY6qKN5HF+CclGcrPDcOklLztPFN8jNrHF4/MdVmJSUWyV5bHSuXHflqd8erhdu0xexCX0R6GHD95FqI1c/fyfS6zQUHrnQnWRcJyChUwBGYYmoLlq+2gfP7B2mcTEuXPeVZeduj6al8sdMAXEKW2QNeJKb0B8YqqkOuJai11ySWclwXAsoR6GEE7yQELXyQkwjqziocVoj2v1KbqOukzxY99DOBQXYSHMw55u8UX2dPUA1Ja2tAUCOmW7pWsBFTIL6GYMVbhT16pm4uwbuGMAEwb/R+VHFbBQcHqd/J4mkqm90U5kEAX+9d61BnD+It6JcrfltRZqh13e5ChoyuKGB51n1pSxDzv3vMnFqa7v3F52Lo3XjDSF8GAzKaio46+GI2xuW/p1mIzjR5z8vgxc8Jvg5WUXcl+eNUobwd2k5sr8XD41PB52BwAfuKcyoRu0eWagcR1n+lmWDak0vsdhNphozsu7fxBOJZLTlV49MNIgjBn7QVFAbpWPyrdwPUHtu+sv9xYuo/W3256fLrJPvgjy2IVFWzAOMmISEQXnLdtEsQSahhn85g0ZSQxnGL/BSmNgg6/7xlE52r2lmLZvHYhhXW+O2ka+PrFsRsEIN++bKLLsUiOMBkVXu9Qo6x5MWcurNUCMXnV5e5wLsQqUBpkSC2cyrdTFdR7hwoj2t7yJF01Gx0uAbyFcj284i/F6cTMfdF7j0DhgR8FcqkFMGMVHxjAs9bgywKi9TYXNA8Jgci+kCqUdNQJBEf5minDUBQ0gT/fXnZPvL0TTKr99Q==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 9b77f184..e9c50fec 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -148,9 +148,10 @@ } }, "InLogicalVisibleIndexes": [ - 31 + 31, + 32 ], - "Count": 32, + "Count": 33, "DefaultSize": 32.0 }, "Cols": { @@ -260,7 +261,8 @@ "Formulas": { "3,13": "项目是否开启反馈收集", "9,1": "H32&\",\"&K32", - "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,14": "父任务剩余工时" }, "AttachInfos": { "3,1": { @@ -496,7 +498,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "12558968-9d63-46c8-b8e7-54bb4deccd20" + "ID": "2527a371-17a9-4e71-bc39-169620d34b3b" } ] } @@ -606,7 +608,10 @@ }, "DataValidationInfo": { "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "01a7e9a0-5381-45fc-a8cd-737703885026" + ] }, "12,9": { "BindingInfo": { @@ -738,7 +743,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "8a40a902-4ce1-482a-94b1-d020a955b6c4" + "ID": "dd4648dd-ded5-4683-8455-6dca0adf1ffe" } ] } @@ -1059,72 +1064,139 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "eeaad282-2aed-46ef-b24f-a356127d8862" - }, - "Value": "0" - } - ], - "NextUpdateDataTableCommand": { - "TableName": "任务成员表", - "UpdateType": "add", - "ShowConfirm": false, - "CheckDataValidation": false, - "ReloadAfterSucceed": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目ID", - "GUID": "aa78d2dc-7c4a-4ce4-86b9-3fcbdc24106f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "d4ec9380-0922-4477-b4ef-358d88c42d46" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务成员", - "GUID": "d0a4b060-7138-41fb-9f01-e13ac1e133c3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!任务负责人" - } - } - ] - } + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" }, { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "新增任务流程", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!B4" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "新增任务", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "父任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!父任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负责人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!任务负责人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!H32" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!K32" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务分组", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!任务分组" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!任务类型" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务版本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!任务版本" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "预算工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务说明", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B23" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "收集反馈", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!N4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B27" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "SelectedTable": "任务表", - "ReturnResultName": "发起流程结果" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "任务ID", + "ResultTo": { + "SerializeProperty": "新任务ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1136,40 +1208,101 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=发起流程结果.ID" + "SerializeProperty": "=code" } ] }, - "value": "%Null%", - "compareType": 1 + "value": "0" }, "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "操作完成" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!msg" + } }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true, - "ClosePopupReturnValues": [ + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "新增任务流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!B4" + }, + "SelectedTable": "任务表", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "397c3b0c-f443-42e7-9954-31dcf859e7da" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!新任务ID" + } + }, + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Name": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!任务ID" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起流程结果.ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!新任务ID" + } + }, + { + "Name": "关联页面", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!发起流程结果.Page" + } + } + ] + } + ], + "ID": "361f4438-d6f9-4a3d-aef2-6c06857d5cd4" }, { - "Name": "关联页面", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!发起流程结果.Page" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!发起流程结果.ErrorMessage" + } + } + ], + "ID": "689c98f6-5425-4f7d-bbb7-808cf158cfca" } ] } ], - "ID": "fbf575b9-9190-4593-ad74-ef80d43f9b46" + "ID": "dc9361ac-9503-4d9d-9096-65aa168184df" }, { "CommandList": [ @@ -1178,11 +1311,11 @@ "FourStandardStyle": "warning", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!发起流程结果.ErrorMessage" + "SerializeProperty": "=新增任务!msg" } } ], - "ID": "8254f0f7-183e-40bd-adbd-c9b4add9e0a5" + "ID": "5c91d120-0f6c-4ede-a324-64aa8ccbeb03" } ] } @@ -1191,13 +1324,6 @@ "TemplateKey": "_RS_Main1" } }, - "31,1": { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "cccaa787-e255-4f32-baf9-5a3d1b09189a" - } - }, "31,4": { "BindingInfo": { "TableName": "项目表", @@ -1225,6 +1351,13 @@ "ColumnName": "ID", "GUID": "ab7e6f36-abc4-48e6-a075-cf361ca3bf6c" } + }, + "32,1": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "总剩余工时", + "GUID": "860df42a-372a-4db8-9676-311a5a2eea68" + } } }, "StyleDatas": { @@ -1285,6 +1418,12 @@ "HorizontalAlignment": 4, "Underline": false }, + { + "FontSize": 12.0, + "Foreground": 5, + "Formatter": 8, + "HorizontalAlignment": 4 + }, { "FontFamily": 2, "FontSize": 13.333333333333332, @@ -1316,7 +1455,7 @@ "Formatter": 7 }, { - "Background": 9 + "Background": 10 }, { "FontSize": -1.0 @@ -1332,6 +1471,7 @@ "Text 1 50", "Background 2 0", "[AUTO]General", + "\"父任务可分配：\"0.0\"h\"", "Background 1 -15", "#FFFFFF00" ], @@ -1340,7 +1480,7 @@ "Color": 6 }, { - "Color": 8 + "Color": 9 } ] }, @@ -1415,6 +1555,7 @@ "17,4": 8, "17,5": 8, "17,6": 8, + "17,14": 12, "18,1": 4, "19,7": 4, "19,8": 4, @@ -1445,34 +1586,34 @@ "21,10": 8, "21,11": 8, "21,12": 8, - "22,1": 12, - "22,2": 13, - "22,3": 13, - "22,4": 13, - "22,5": 13, - "22,6": 13, - "22,7": 13, - "22,8": 13, - "22,9": 13, - "22,10": 13, - "22,11": 13, - "22,12": 13, - "22,13": 13, - "22,14": 14, - "23,1": 15, - "23,2": 16, - "23,3": 16, - "23,4": 16, - "23,5": 16, - "23,6": 16, - "23,7": 16, - "23,8": 16, - "23,9": 16, - "23,10": 16, - "23,11": 16, - "23,12": 16, - "23,13": 16, - "23,14": 17, + "22,1": 13, + "22,2": 14, + "22,3": 14, + "22,4": 14, + "22,5": 14, + "22,6": 14, + "22,7": 14, + "22,8": 14, + "22,9": 14, + "22,10": 14, + "22,11": 14, + "22,12": 14, + "22,13": 14, + "22,14": 15, + "23,1": 16, + "23,2": 17, + "23,3": 17, + "23,4": 17, + "23,5": 17, + "23,6": 17, + "23,7": 17, + "23,8": 17, + "23,9": 17, + "23,10": 17, + "23,11": 17, + "23,12": 17, + "23,13": 17, + "23,14": 18, "24,1": 4, "24,2": 4, "24,3": 4, @@ -1499,34 +1640,34 @@ "25,10": 8, "25,13": 10, "25,14": 8, - "26,1": 12, - "26,2": 13, - "26,3": 13, - "26,4": 13, - "26,5": 13, - "26,6": 13, - "26,7": 13, - "26,8": 13, - "26,9": 13, - "26,10": 13, - "26,11": 13, - "26,12": 13, - "26,13": 13, - "26,14": 14, - "27,1": 15, - "27,2": 16, - "27,3": 16, - "27,4": 16, - "27,5": 16, - "27,6": 16, - "27,7": 16, - "27,8": 16, - "27,9": 16, - "27,10": 16, - "27,11": 16, - "27,12": 16, - "27,13": 16, - "27,14": 17, + "26,1": 13, + "26,2": 14, + "26,3": 14, + "26,4": 14, + "26,5": 14, + "26,6": 14, + "26,7": 14, + "26,8": 14, + "26,9": 14, + "26,10": 14, + "26,11": 14, + "26,12": 14, + "26,13": 14, + "26,14": 15, + "27,1": 16, + "27,2": 17, + "27,3": 17, + "27,4": 17, + "27,5": 17, + "27,6": 17, + "27,7": 17, + "27,8": 17, + "27,9": 17, + "27,10": 17, + "27,11": 17, + "27,12": 17, + "27,13": 17, + "27,14": 18, "28,1": 8, "28,2": 8, "28,3": 8, @@ -1539,21 +1680,32 @@ "28,10": 8, "28,11": 8, "28,12": 8, - "29,1": 18, + "29,1": 19, "30,7": 4, "30,8": 4, "30,9": 4, "30,10": 4, "30,11": 4, - "31,1": 19, - "31,4": 20, + "31,1": 20, + "31,4": 21, "31,7": 8, "31,8": 8, "31,9": 8, "31,10": 8, "31,11": 8, "31,12": 8, - "31,13": 8 + "31,13": 8, + "32,4": 21, + "32,5": 21, + "32,6": 21, + "32,7": 8, + "32,8": 8, + "32,9": 8, + "32,10": 8, + "32,11": 8, + "32,12": 8, + "32,13": 8, + "32,14": 8 }, "SheetStyle": { "FontFamily": 2, @@ -1566,7 +1718,6 @@ "9,1,1,14", "14,13,1,2", "11,13,1,2", - "31,1,1,3", "12,1,1,6", "5,5,1,10", "12,9,1,6", @@ -1583,7 +1734,9 @@ "31,7,1,3", "31,10,1,3", "31,13,1,2", - "29,1,1,14" + "29,1,1,14", + "32,1,1,3", + "31,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1615,7 +1768,7 @@ "MethodName": "Focus" } ], - "ID": "38995bb1-b541-498b-a4cf-989753c60a41" + "ID": "b856e798-0d7b-4f7c-b79f-fe84316d09aa" }, { "Condition": { @@ -1649,7 +1802,7 @@ ] } ], - "ID": "936b40b8-1ae5-4579-b9a6-e6a49f1d5840" + "ID": "f3fba1a5-03eb-47b0-916d-b77d281b5b94" } ] } @@ -1670,7 +1823,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目表", + "RelatedDataTableName": "任务表", "ConditionFormatRulesCollection": { "Rules": [ { @@ -1703,6 +1856,22 @@ "IsDisabled": true, "IsInvisible": false, "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!父任务ID<>\"\"" + }, + "Priority": 2, + "GUID": "01a7e9a0-5381-45fc-a8cd-737703885026", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true, + "IsInvisible": false, + "IsReadOnly": false } ] } @@ -1743,6 +1912,10 @@ { "Name": "任务版本", "Formula": "新增任务!$J$16" + }, + { + "Name": "父任务剩余工时", + "Formula": "新增任务!$B$33" } ] -}//QkD4e7oyR+pLUhN2QPbyBUL5dJC7ObLehKGcgFhqxNApauq2FLy3ZKSjgN80GiBiM7d07GC9H8yy1q23TCNAb7iD2dP++qBkHF4PfFkPklNI2zBMK7OxJIByT6O1Q6KuGIddoS8hdp262eDc+ZKx3xPvPM3W09B8RW76F2269YfKNVmiyAox8FdfurHHv9TQw+KsF0eqRjZnGuKKxm1Ib0fUHQ2j6vdSVxYZt7ELKkKQgLCcY7s4KRXE7wqJOuUh/Dm8OZ8tIRO3mkU2Z5gsK/tqqqZS49Lfn7J78CLCOS4k9dLH4QlCbop2uaqqP9dLEe973NYHecxZgbzObJdoAgoYAbTC3k9N7KvJtTxaRgMdTT2K6BfpZ6d0nIdFsJ47l7/NQVBjbZipdCx07qM98phQ5TYymGDSLnLWPvNjA3SeTi/uyyniWBpad1CBolHRlw4oa/Bh7QaEGTloeASwwnTHav3g+K+YMzcXRog9CnTFyo7VdE1vTC2jgAEHqGhp3cHnRLnVWd+hahiiMfOhXDPSm6KdyYv8/geffooLfzMp4AiMvlZPqmhT9Cw3iD8vX8c8RPQ7WMw62g1ZOYI4a/SZ/Ln+dyuJIFYGTPZR58VLce52fhnQ2WCQjVcNxbk1jRgZq6S/zK4Zmx/4O/85UeJADzpzMiLyGfxC0sG35Rn9RXEJgDoKUVMG47SoZDcjMOc3fwbYUBca2rKdpc/hOzyRV6SHgJStJWq/LQi8IxJgyJ76wChjdVQj3cm+vi2RprJxbPZnO0PXbAdGTHnLPbHSFpmJqZs8T6bvTqzT78oqL1T8T+WFywVIyxnAtM7bahlGkZXZakniAGQoyCjIbQDBOlhsXtK/jo7yYmZ36lhFQS1+kDkkPGc7wRUig0OZEN+E6R5yFqDFRImOX4gs/w==|920 \ No newline at end of file +}//epNlRS+tQ57M9P33PxfLoerORScUrpUpzDrY1fo/vrkMVvIJ10fs8+8OjZ+NjQjyuIxDuSwN5YNutLHxz5DrXGDmpmPpNjcBibh3c+Grq3Dy3frjpA/niDIOMnHkFydQNpsHFWWHbqN7D69Uz7PCpyEFQjuRMtX9rRJdT6BthzqqyqEkUecrrcnXyLtgI1goameXqvYUo4EYLHNufjV0l/S/JXlhI6axzZOeRhIHBKdaVVcbf++TQGPuBkOMbrJHNPfXZF0ysm3bUJCe/bvQND8Mzg7TkSW8wFb/4p0ZmObOfbmdtIBKmfbrTJ/QliO+g0Ht11o8fPjZBOiiIs/Fjv0xF9XFV68sPMtAQtulBMmN2rnEXyUb2Srzos5s0+gMIcEeBah83xBp8/xW+N4JAURxQ8pjRf8w5RQtDQ5aRn3IfhOmTh/pb3OTJ5x92W81fF2qKVdD2NwQYiypyZzbd7hd8U4DwIq65Spi81VHu69lc759u4ZxcQ1EBmmVbq0nqUvpgeFgWBYsrqPcCOpByOklqwmEHlqyvYqr3wQ96bJpAW+plsp1mPZ+YQ2Nc/2bu6o1yJCvZD1FLqYjupy0RT3pjmvddga/nXRpldUgmh/og6m0dcqSHfP4QLVe8Rg2TdLTXncb/cbi1UJpXPq/TkKXQIKVQLYxbpnX4Q61kXQVgCWyOY0q5+Z9bQhizq87DwN00zF5phYO8/AlZBCB5j/YRZ7aet9XxXsD3E4r5mUnjW4f5rm4IRkIjgdi7ivFAzvNFtppj6ks43DWw9JJOjBakZflHsrJNC97VJigL+bzHGE1KhvNsZ6uYP/tW5sp1H/vpl4n3yb6Nhd1yAgI0eavXm8kAz59g5jcqQUeT5y1oTOOassCDWmLLPeRf9SsR1pZxy4zek87bt1yFZudxA==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index e6216c51..ea9ec9fe 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -1,11 +1,12 @@ { "PageType": 0, "ColumnCount": 16, - "RowCount": 32, + "RowCount": 33, "Formulas": { "3,13": "项目是否开启反馈收集", "9,1": "H32&\",\"&K32", - "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,14": "父任务剩余工时" }, "CustomNames": [ { @@ -39,6 +40,10 @@ { "Name": "任务版本", "Formula": "新增任务!$J$16" + }, + { + "Name": "父任务剩余工时", + "Formula": "新增任务!$B$33" } ] } \ No newline at end of file diff --git a/Pages/共用/切换项目.json b/Pages/共用/切换项目.json index f707166e..f496c1d9 100644 --- a/Pages/共用/切换项目.json +++ b/Pages/共用/切换项目.json @@ -63,41 +63,41 @@ "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目表", + "TableName": "项目平行视图", "BindingInfos": [ { - "GUID": "b6f0f878-6f74-4d45-af16-1936e3859d85", + "GUID": "91d06f84-bdaf-4eb8-8bd0-f838351a6216", "BindingInfo": { - "TableName": "项目表", + "TableName": "项目平行视图", "ColumnName": "ID", - "GUID": "c3d81821-9f32-4033-acf3-5f69cf820b6a" + "GUID": "869b2d54-16f7-484b-8ebd-c9f5edd9be9a" }, "ColumnName": "ID" }, { - "GUID": "f01b8984-9ac3-4df8-8dd8-e873442e23e2", + "GUID": "08b3bf6c-1701-4180-82ed-353bde420c2b", "BindingInfo": { - "TableName": "项目表", + "TableName": "项目平行视图", "ColumnName": "项目封面", - "GUID": "526d4fd0-69ce-4cec-ba12-83e176063060" + "GUID": "f32be9c2-8b19-42df-ba50-fbba486eaa94" }, "ColumnName": "项目封面" }, { - "GUID": "effdfd12-f2f6-4e29-9f10-5464a5c75d7e", + "GUID": "9f2c8670-0bdd-4f90-ba3d-f22adebf092f", "BindingInfo": { - "TableName": "项目表", + "TableName": "项目平行视图", "ColumnName": "项目名称", - "GUID": "4595061a-57b9-49b5-8e33-c4ac21ad393c" + "GUID": "4265d976-1e15-4a84-95a2-e84eb58d3bc4" }, "ColumnName": "项目名称" }, { - "GUID": "d4172c8e-90e3-4ba1-85c2-cd7e93d71ba4", + "GUID": "fdce0b01-60af-40a0-a573-f35414f66902", "BindingInfo": { - "TableName": "项目表", + "TableName": "项目平行视图", "ColumnName": "项目简介", - "GUID": "80aef910-5f20-48b8-9820-9635b43e7b51" + "GUID": "c1438ca5-6806-49a5-b6c7-89d1da241bd7" }, "ColumnName": "项目简介" } @@ -164,4 +164,4 @@ "PaperSize": {}, "Margin": {} } -}//dKAou+nerNXD+optyriUJXUwAgnuRaSkrGvb8DpsnqEHy3CL9T8RUWf18oXOVE7iZaCxlEskm9iMyqzfy9sM1afTcy9nZ5TwJ4BFjA/uzl5g9EzmR6ctvr0cAqijEaW74x/X7B0NK/Sl2D/kSd76YWA0aoXqfQlkegxD86TWALIudpBWyA31CIXc0qTsOvktgi3iIpcXmHYoBIR6dW2ys2vYsmFKoR3MoxWwonO0zKShsPETsnRYaD4DX2CG4vUiWM8aipPo5hMoPswScI7nG2Zk6cw1fTYLm/eL8fnCDCnlvFas/CnhZBX7HQoRxD5tg1sEM5S5JIr25Xzw2yHCTjf25o215H+jLaBIpdvIf0zelcYeRmWOyWWLngK6h0Xpun9kvKk0KoZ4ITmHB5hc5wY1t+AA/0bpAKzOBL69vcQ8r5eQDHw5xK4uF3mX+/IslRSVkgCTqUCBeyHNH2W7tw/d7QZkhZoKSDtMmATL0Uv7tyqQEuA98R8oUcsLmbbmlI2JM18PmyhMmMpwGCENuE308Bjuvi4d2fOKRq2Rwhh0nEt7n4sRTKiY3YWbrs37ojDhj3GMzWiHh+0pfsRFBZIP7rONOKFqlshUqA+oHbWnypXP5bsyf5cMQeEySbmHQQm2N/tva497lpE+cb3dKL0jwjPGTkbm4VxCibVSnNjD5a4d6msFhjOY8WhmxhTLxfEAhPSD5iQq0y7Mk4GjJ5hWdBM9P6U4nmSha4yYtq0dadyUzL3QNbqa/eli8krnDdQD/3woOTd2+zhTxy7D37XU1CcOaOkciNgQT2WMV2Vj34cqyerTI78iOEIzFn2r3ZSSAPLATVlXbGC+Tj8eOWW8SVwgBylpoH0BGOmCl/XmpBdetMCeEWKYQN1oyluT8aGy6rZzMt5G3gdX95DbEQ==|920 \ No newline at end of file +}//3p72Bj8YZnPgsroRpeeDk6Al8eSevAiwAu9owvIeoR7S7I1yM0uw7qj+PQVJiKE/J6PPWxu4ZwiKDj7i5jFoj7slozCQiipO2SnpEoLMZCBdWBsTd6b5H7gJj5nvZEN6WmfwW50OE9uZ/myMxsbM30mcp+/jkv2hnOpuaqqtI885h5ZJ1/D8FvXoPP9u35KaJQd69D6oe9zU7n+35+C2qiJ1X3H0LddTtCAQ+58uycmMDuXc0zlsFH55zzom60+fa5qDsn259hlN5bjTQN05Ek1gst0t87TiPj6DxEchAgB/MZF7FKsd8deKOeZpFrRHzLIlQrB1ZeowQFIF7XJAv+dRcDggGqXOzIl+Pf9/rvLtKIXMpPaCZgKRcmAMyJgxjpin7BMNe4qTK8IatRYhmTJozSz5OexQ5L0BkHxGoChFiSl7uExPoD/swU3sULgoCmy+vA1eZMLiobdOYUhQx/ZI2EvI6luRZ+MfSDwiELbwB6ufzQt1sMNUT9Y0Xjy7RrF5ntb7Mi2lH6h8C/wfDfXy5JD63uNELRgtDhCX+fAYN6TCM6lKcKLZ2+n8CoVGW0yNzdj2odFMdcAyb6SM7Z3B/NvNkCehgQqd6y/Inm0NZMewi9hF27ac1IBkCeWHHxPfL8cEvi5RUw/UR2rdvD7+e1Xnf4SyBh6381yHsxryGNxiUFSerWKCnuNIntvA2ww/vgYYJbBxA1rkXxXw3BAg90oGiYdG1ZiMHMPHrSZe9sOjECYG+MQpWkBannQnnIDJRg7MAYAvGVsgzvX36taB/+slqsTS1LBaJjmvO6M7CqXO7PSX4OGjgsftsNBxvOIy2Fg6FopLC5Jy4SV5SIh+YHRM/duNPs3oZM2hvawhfZ+XbfG1kIda6HI4QqC5TZMqhPIFchzufwI6WNp/Jg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json index bb102c94..5c50d4ce 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位配置.json +++ b/Pages/项目/项目首页/项目配置/项目岗位配置.json @@ -283,7 +283,7 @@ } ], "type": "text", - "placeholder": "请选择", + "placeholder": "请填写岗位名称", "resize": "none" }, "DataValidationInfo": { @@ -339,7 +339,7 @@ ] } ], - "ID": "2b33669b-04fb-4c6d-8ec5-ef8005b79e33" + "ID": "5d2918f5-e0e1-41cc-98d6-ec378bd4fbfe" } ] } @@ -370,6 +370,7 @@ } ], "step": 1, + "placeholder": "请填写岗位时薪（元）", "controls": false, "IsDisabled": true }, @@ -416,7 +417,7 @@ "Message": "请设置时薪" } ], - "ID": "6b827472-9ee1-464d-84ce-6bd4d39c4bc5" + "ID": "85a43e14-a5b0-42c4-9b25-4d18b54660b4" }, { "CommandList": [ @@ -425,7 +426,7 @@ "ErrorCode": "0" } ], - "ID": "89b89d8e-bba6-47c0-a38b-bfadbc331c0f" + "ID": "98e23878-b7d8-47b8-81be-2d050c09d0ff" } ] } @@ -467,6 +468,7 @@ } ], "type": "textarea", + "placeholder": "请输入...", "resize": "vertical" }, "DataValidationInfo": {} @@ -530,7 +532,7 @@ } } ], - "ID": "303a6156-f755-4371-8ace-0634ab7557e7" + "ID": "47ccb8b0-3cf2-4aa1-b033-66ca69c3e19c" }, { "CommandList": [ @@ -545,7 +547,7 @@ "BtnText": "知道了" } ], - "ID": "37979802-5d42-4ef6-9e22-5b6a2d00894b" + "ID": "05620e08-f825-455c-8a11-3e33e313a081" } ] } @@ -616,7 +618,7 @@ ] } ], - "ID": "696e75de-fadc-46d8-a712-8360ab6c2d07" + "ID": "88c813a6-b36a-49a3-b200-1be3bb7aeb4e" }, { "CommandList": [ @@ -626,7 +628,7 @@ "ShowConfirm": false } ], - "ID": "db75207e-dab9-4a04-8c7a-fbaa6a931bc0" + "ID": "facb130c-be51-4dfc-b195-4ae7ffe4657e" } ] }, @@ -648,7 +650,7 @@ "Message": "操作成功" } ], - "ID": "c63dc4be-71ac-4a4f-9b36-d564b3d5fba8" + "ID": "a56e68c2-1494-4c33-b4da-acae410ac762" }, { "CommandList": [ @@ -658,7 +660,7 @@ "Message": "请指定项目" } ], - "ID": "a9ddcbe1-1ed7-48b3-888a-863cc1df34af" + "ID": "9432f20d-e1a2-4ad4-9c5c-99332a42ed5d" } ] } @@ -968,4 +970,4 @@ "Formula": "项目岗位配置!$B$4" } ] -}//4tqFWXeZvYMRZtfaZUsHuc5LViQceZczpibYW5zNLb6LhW/GOegcvaVj64lIHf+XckJO06NZTpysa4JfB0nr7i3Yn8KZWsCJZeWEc+ZJk7ITnfF03nFQcNrG6ZcM/f76v5xxMt9knf//ZAK2XeJHLr4u5B2G0e8RXeKBitwBYii5acaAD7zaeFuvxTO5mxSj8TsqMEkCVKHXdCWFvM5LlHHb76feeNNVpcRUWy0QgDijjuXLIDmw8MwYXVV0vR3LORGK/x2bAZ9pyUd0iDekSiOkS3zSP+YfdSnR0Oj3XDDQG2cYbZznDGd/S81KDh+Az6OXhxzUfdZfDkpIUfNXXI8sKiBfGvlR6PNDjDCTAhbbRftAZd193Ar2PI8DN95ajA3/hl8s1CTpUpPB7t0KRlukjf6htnzvKpBI2gLCwf4OX0uRWsWbSRH+G03OMsTN5brkJDnCz2g4RePN9YzkyDKNElhzSB0EtQXsTWOxWYTeozmgDABPQQGWfmoCO/AknMaZz1Gs9FL9VRvlJcLjVM+TGC6Qv29std8zj6A256RW7b+KpB0jwZ+iQZgYwRh0CvvbmnANtWfnNKOW/o6JIOH83vioI9zdO2PkzkrzWFplTSJO3Ea+aZtCeCC6q0rGNy6Gw3YPyTSiJKU/olT4MVxkxNqm9AdgjRECf+9xW5ho9DfSSnmbVrOzGBFZwgttNiC66EbVvFnMs7J2NrYCV3RFpzPUYoPR4nsfkPUgOQBahR3l/VkOVTEhaPjLmdl7sUrHzNqNzRbqQEnaXYOn4F9GAO9SzZLjqwi88pAO40ghIw+U+jjci276ec6xQcfK4vSt/y6A0Wn0nJdVILNTALmMtrsp57kqrc1TKu5nZiWdlUfBNiFhfOu65Np8Qw9YMxAWciU5arIWPqhilZ/NQg==|920 \ No newline at end of file +}///Yd3NhIJFnBf2wLe1fe5m91OtPtRmie+RtIcfmOTZ0DJOKqg4XDvT40p23bOKE1WqTJebvg2LwwIOM7DMx6EV8YPMosHldQb8ms6ZXmnZdnMSGzUgoTNn+4ltdmMgyYivBnfxViU/W01X83QTFbPo7hAtfsKwQ1CfNHwjDuXVwIi9+UjOzDQbuqI8fYDZMaeraAfl1b2ACNaHkWAum68e6yIeAZSWJxTCeGvTFna4KFHY6q2DZGoxAvdmixopxlPtWpYGHDJcF2nfS9XQTr3Mm35VifEfxcKTyODh/rKAQJKoaE6TMU5sxkrMTzGGbiKnZWdO/YCK54rgQ5aMMmQRfb/Mu1Br+s0YE0XePjMAROmxv6esfIy+I9qDZMfJpMChLQ1jAJUvgi/f1W+7wjYn8RXuEHArTA8R/MsylbA41bTExLT7CNZn++49NqED6ZeZyM5lu7l5wrhMi0sCV4iDcPSsgBJ5vagdGYHoqd6BJbZfhDTPLuqLb/LcGfdZX5ibX6+546RMmADGjIzeFoRBibT1oDVJhJ1UnJryjKpGLIXfKJjLzykW3F++FtaoDLirlyPqGws5MvFEDhoi8RVYoOPjtUNscmVf4wVN3TAyxIrhDHlsS67M16OWQb/BE696ENQxcSCZTAvBj5FjbVpVp4IWqFiucSNbvP06Eh0+2LAYvCmUa9+zKh4wvqZSWupS4zp/SCvFjyw8VFFWLUsG6UcI0zx9mKQzjX/kExPPPrAtYfHxy5BD71AL1IMNHBTwT21stdU9Zw0ystJXXaL42jZ286vnptFPGxYKTKmGbG6Vy7rgI6/26kO9sYlO+EVxBCHdhclfdJ5qhcYpnGj/jbOyOC6EWZcSZLc1VinsnfDRAZwZncdoBcDFNyX0w5acbZgLfcVig0BiZaKDZgHuA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index f252c98d..f89bfc31 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -64,13 +64,17 @@ "DesignLengthInPixel": 15.0 } }, - "11": { + "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 37.0, + "IsHidden": true } } }, - "Count": 12, + "InLogicalVisibleIndexes": [ + 12 + ], + "Count": 13, "DefaultSize": 15.0 }, "Cols": { @@ -481,7 +485,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "1c95b409-14a3-4be9-9e3e-ae377a5c7d4d" + "ID": "c604da30-cb73-4934-8544-26b41d9f59de" }, { "Condition": { @@ -515,7 +519,7 @@ ] } ], - "ID": "55b45450-b607-43f8-aa52-47c66c174737" + "ID": "c9e4aef0-06ea-467b-9434-6d70ee1189d8" }, { "CommandList": [ @@ -568,7 +572,7 @@ ] } ], - "ID": "364d770b-2c63-4ffa-bc33-c0ef64e1a33f" + "ID": "3f38e4d3-4aed-4402-b817-156caf6699c8" } ] } @@ -592,7 +596,7 @@ ] } ], - "ID": "1c222a5f-db60-447a-a98e-6494800f9928" + "ID": "8fe7e679-514e-4029-90d9-dc6389b8c7fa" } ] } @@ -630,6 +634,32 @@ "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "a3c94948c8a24e6a9d63fc05ebfd71f", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!当前分组" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!ID" + } + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "图标": "图标", + "分组名称": "分组名称", + "任务数量": "任务数量" + } + }, "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", @@ -701,6 +731,7 @@ }, "DataSourceListviewName": "图文列表表格1", "TemplateKey": "悬浮变灰", + "AllowAddNewRow": true, "CommitDataWithCommand": true } }, @@ -756,7 +787,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "221e202a-cf7e-4ba2-a87b-ca7e4b8eefce", + "GUID": "04c39ea6-e635-4a01-8cf1-94e48441ad95", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -765,7 +796,7 @@ "ColumnName": "value" }, { - "GUID": "fff0a273-15bf-484a-b684-193cba4906c3", + "GUID": "0db56cc2-2664-4258-9966-d4259380fe21", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -774,7 +805,7 @@ "ColumnName": "parentValue" }, { - "GUID": "d59a1f62-22e8-4e9c-beb3-72f4bc0159af", + "GUID": "d9f94e69-c99a-4db5-9396-93a3ecc5e0eb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -788,7 +819,7 @@ "ColumnName": "状态" }, { - "GUID": "7dd361a9-1b2c-489c-a46c-ab598d21dd05", + "GUID": "db3bb0ac-b3cd-4b95-8cab-37b4d3f6216e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -797,7 +828,7 @@ "ColumnName": "任务名称" }, { - "GUID": "29b244b6-aa98-4ca7-a310-aa4b2c449443", + "GUID": "869c5cbc-57bb-44dd-a79b-4bf78876a265", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -810,7 +841,7 @@ "ColumnName": "执行者" }, { - "GUID": "a361bb62-9804-4389-8104-8a66bfab8bdf", + "GUID": "3fe90cbb-38cb-4119-b4f9-a92bb0eea2e7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -819,7 +850,7 @@ "ColumnName": "开始时间" }, { - "GUID": "8d6431cb-2392-4738-897c-ba349213b950", + "GUID": "f440ca91-027d-4f04-a9fe-f4a0ee7b3937", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -828,7 +859,7 @@ "ColumnName": "结束时间" }, { - "GUID": "4ea5bd32-ecee-4d6a-87a6-e1a286b34d37", + "GUID": "6b01a452-87ff-46d4-bb33-e5912572d242", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总计划工时", @@ -837,7 +868,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "20962eb9-f3c6-4069-a49b-2916c75c58e0", + "GUID": "211c7a20-bdd7-413c-80cb-bcd91590ac31", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总实际工时", @@ -846,7 +877,7 @@ "ColumnName": "总实际工时" }, { - "GUID": "d0338059-8b35-4e36-882b-6885580ced43", + "GUID": "ec6c0bb7-cf94-4e85-aba7-bbcb0b2c07cb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", @@ -906,6 +937,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务列表!AA2" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "分组ID", + "GUID": "17e883b4-67c9-4596-b6ca-697e53911a5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!当前分组" + } } ] }, @@ -1083,7 +1126,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "60cdf47d-a868-43bc-939c-c6945291ecd1" + "ID": "a1f3c87f-0939-4025-873d-db34789413c0" }, { "CommandList": [ @@ -1122,12 +1165,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "187e8910-d123-4231-8794-25ba08922ff2" + "ID": "ff756337-3fd1-4951-aa30-c949db64ac51" } ] } ], - "ID": "3d871a90-7bcb-467c-aa16-7eaf4f2feabd" + "ID": "beb6e3d9-1402-42d0-a52d-408233206293" } ] } @@ -1339,7 +1382,44 @@ "10,36": 2, "10,37": 2, "10,38": 2, - "11,7": 0 + "11,1": 4, + "11,2": 4, + "11,3": 4, + "11,4": 4, + "11,5": 4, + "11,6": 4, + "11,7": 0, + "11,9": 2, + "11,10": 2, + "11,11": 2, + "11,12": 2, + "11,13": 2, + "11,14": 2, + "11,15": 2, + "11,16": 2, + "11,17": 2, + "11,18": 2, + "11,19": 2, + "11,20": 2, + "11,21": 2, + "11,22": 2, + "11,23": 2, + "11,24": 2, + "11,25": 2, + "11,26": 2, + "11,27": 2, + "11,28": 2, + "11,29": 2, + "11,30": 2, + "11,31": 2, + "11,32": 2, + "11,33": 2, + "11,34": 2, + "11,35": 2, + "11,36": 2, + "11,37": 2, + "11,38": 2, + "12,7": 0 }, "SheetStyle": { "FontFamily": 1 @@ -1355,7 +1435,8 @@ "1,26,1,7", "1,34,1,3", "1,9,1,8", - "5,10,5,28" + "5,10,5,28", + "12,1,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1394,7 +1475,8 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "项目任务分组" }, "PrintInfo": { "PaperSize": {}, @@ -1411,7 +1493,7 @@ }, "IsAutomaticFill": false, "Location": "0,15", - "Size": "1196,336" + "Size": "1196,378" }, { "FitToBrowserHeight": true, @@ -1421,7 +1503,7 @@ "Fill": "Background 1 0" }, "IsAutomaticFill": false, - "Size": "222,351" + "Size": "222,393" }, { "Name": "6a8619c3-eb2f-4fd6-82da-9e421969cd18.png", @@ -1453,6 +1535,10 @@ { "Name": "任务分组区域", "Formula": "任务列表!$B$4" + }, + { + "Name": "当前分组", + "Formula": "任务列表!$B$13" } ] -}//3g8rU0S3y+SQJarYrLnvsvck8UwB50o2cVSOJR5jvrzgJ8OdyxL44aoiGHjTOhqBh0TduA7g1g5NusU3MCvoqxQS0Nb/KLITqCQQr9SPz1q4nazihQ0fF3R2DcmFCEqDgLwJ1SOIGlGrTs56oGz89iUxYdrFOG2VieX0leTVmGEsYf/BnwQ50+OJwDXnArHPGBA+ky6yJBYnEHwpke8uO7XEa234H1/4nn+LONUING3bO+P5OLR7g/ZnZKvwaVJVyKIE3plfSz8ZfJ56ao/dNxOA/5fJKV+nc/7n5kF8c7Twy9c+e7vaDQlC7yVCLoAj1gaYLOWlKTtviU4imkcPj+k4RjWAil/cj4fH4NFwvOnO3z1bAkl5hp43stjbiC+3azBofzRcWuefkHXOydhzXuNFqaPbF0Nw5d1fbs6ltacqIDZABwnmp8GexQt0YSS8JDsw4B/dUCF3n6GVa4xBVCoWPPXNOHKR1g/w79tK9sj8vw7TMOvS9MDErGbVUkqnqjPPMimKsfOUq2rpUJZ0Z81k9vLfAuTy/ByvDWtRJDw19hSIMoLBvK94NaAOT+f2QWMq4hJR+yxBm0KI5lO286OG00o7V7TYXXfNV5MvnnlhqCWNGeLA3QqgcrhYnEOhprC4xYR0WBg7BOIZ9AJMjTU/OtFNWmX8YUbJ4XXlHztd4FQQjc8cA+HcwPUgUhzbemawFQwwzn/T108BvqjlEP8wUictAHiBgRtH62NIi+nz7D2ykgqPowzPxs57l8kFNX8QfUYwgozQ280Ze8Z43nwi1p35Lgn2oIpwAGl7VBY2I24zo+0vFhof21UTHT+n18xIv9qKMN0qRjI7KXhsD236Q053NzX5I6E5ZJGHLKRXgkSM5mGLcXNLA/ggGSRXuiynLvcq1Te318cgh5QxkA==|920 \ No newline at end of file +}//wVhsMK09ZUHunBdJuYkxMPn3a1RVyzQFNcD3JaEJ2VRkyb4Y7Z5/TCLQY3jkSI052zg1OigIDLe8vdla8POqpAOdKfGVXjD/Zb7YnGfvH5d4zMJODyuxXbEqQSjEt/BYkk98/IOqB/lTXyakfVVFA6N6FBm/nuRN+o0in4WxTXkQksC6eFe53uuHimKFqw7XFBV8C/oE8EjairMzt8qE+LQhmfFY7Q4xGoadfklH0wtLgTbW8hC2Y5WIRc+rL53rCSLu7QxMFf/C1BQSs3pWxwAhjmQWKpNmCb7O1OmxuJOyPHKctZsZKq+TUxrRjzDW+rt15aNQ05o5iOt/RLEMHflrEmhlTwB11NpqjSNbfTMzr3h9nlwhLoaPW7d4Q3X6fRU3zBDV6pajcbOnGR88ahR0KvQPv4O6s1J01wzpn7TdKfBjnqjhWEOmgEOrfUEegsd7kE12oxgof4egphtsH7DZKDY6dIM6dTHrejRfovMALiv8pVuPXq5BOpOt5+pOv+nhX+3xsaEnFiSB+NqU+Hq6SwkP4Hx7sfeUQDqMmTjDMHysG99qTV7oiNoK/VceUI2msJW/AhgxDhP+qqlZXeBkQHhj2VmWdSlT18VwjLZLRuSZUngRh6xYox8gO4fXrdsY8mFYbQ1qc1O9sfwcvmJ3wZ8FPyV1BtpgeFCU4ujHQUJ2+H/dZFq7IcC6pZPIZYWOXlINEQxdkKZndr+eTb4ScWbUrnQjx3c0HpGlLnQdy7UZ7pdb2FdUKYXbW6aPxypM5JjWmksnH9VJmNucc0UY/2TpLVs0zVje4qie91cBkdrtCLbXndlloQDVO064IRqnS0847obGAcituBxxOdho+q6WcuGe+zlWbbCpNe6GKBoeKD2NVPSfL0m4Z1YFgsw721fLQGPWvd714XwOZg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd index b54fb775..f91d3fd7 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd @@ -1,11 +1,15 @@ { "PageType": 0, "ColumnCount": 40, - "RowCount": 12, + "RowCount": 13, "CustomNames": [ { "Name": "任务分组区域", "Formula": "任务列表!$B$4" + }, + { + "Name": "当前分组", + "Formula": "任务列表!$B$13" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json index 799868ba..0a898f20 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目代码.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目代码.json @@ -320,15 +320,15 @@ "DesignLengthInPixel": 16.0 } }, - "43": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "42": { "GridRowColumnDefinition": { "DesignLengthInPixel": 298.0 } + }, + "43": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "Count": 44, @@ -421,6 +421,7 @@ "1,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -633,6 +634,14 @@ }, "ColumnName": "空间和仓库名" }, + { + "GUID": "b0e59c53-50f0-4c05-b130-b126318af202", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目代码!仓库ID=\"\",\"未绑定仓库\",项目代码!空间和仓库名)" + }, + "ColumnName": "副标题" + }, { "GUID": "713887b8-3999-4945-9ac5-2ce140aa3df2", "BindingInfo": { @@ -1518,4 +1527,4 @@ "Formula": "项目代码!$B$28" } ] -}//uMuUJL/yioAYfUrJXaNzOkBIXHPqCyxf/glQb+8pMCXvND/TFOUGAwiB/ZsUjE+QFtwEnJAIUu4f+QrZpZOcboCUMsAova658UhPhgYfdJhurHlVK0/+g2/izjYVPAiQl4SZ2PM0C6y7MVrqz2id+HVe3i9mEp7E39S2HXxc4Ua/NUmjOtqvxppK+f5is6VJ9hsdzFgGX+YC8wMnjMH+PF2XHvAAbq7T5+iiPsm4nvFBDJLVijhvQyZ2Q1+9Ysq2ps/fl6sb3rSKyzVhBcUtYK/a85olq0WB73j/RtpcX1Axj7ndokCqwEQRlFYtYmF5B7AC3O7uUDHz/M+Udqse61Gybg7X7wf0BP/VsP3pMpJ2xVGWvEQ/QafhhczmolvpZoncggcHWsdAyYcaIvOHop7JuVYerXpqe5oz6LdnwPXA0MhwXre63qSCL0oDOWR3qfy+w9Bw1nMRMoEfAfUej/jNRQ9b/InrhZ66XJW5Uj+qTPwOqJqtoxB5JhmUP7dUUagE6ppHfAEXi6Ax6h8m5NxZFDggerwj8JFc9xOdaFJ71xiypyGndaE14KG6gCv1B7HZGnHtHQ7/Nu8nzJ/aeF035nDqsqO6++G2hYRYnAQMncDYlEaOkV7BRCl16b75tSiT8ioSrIQmF9X3XE6J2lYbnRskOn5OKIc1u7ja1UHPMFOS+MRRrVTIermHN3nng7zAmDX2P4eYOcGnHxAWGONliDzLxmvBeI/4IGXi/K7V/ymsyvqwAF9KDlsMWRAvBAW+g9lXpYNY2la57kVHAgBI+VY2YjxckdLZx3xkTp16ea7Ut74tKX8VbkzR1erahTs0Mls3fHC5r0ke0tPJJNsmFMMLwGkatJXFCLJkSZ3tPXoRBIUVplGbaTFDDwbb16CVTkCiaQQIvTDUAMGMMA==|920 \ No newline at end of file +}//mnvjNYQiLABdzeK1Ni3BpyjBtQn0ycywpUNCeXekXyTQhtgDroi7C0j+gbR0StS9bxrWxhUA8CsX4EL6PLoN1HTHE8dHXxvEZPRG/FUdw+m4FgJtfkyOq+PywXS1j2tTqzvGTS4ecBiTUSy3bVdqSlg4V1DaNfRlRHd7BWoXgpbGs9yqj5AA57HQ6tiSwZrwDdLsY4tmrK0k6VnQhPDpI3b8CqkJogmzpx/9rD3JoMyrbWBLonhqJSGX3cDTx6j1pCNT2kdD/Ub1VJNEwFnZEywDaL6x3QvbEN1VuQZn5SloxISCZFLlqsF2wg5wA5YDQe49KyfLKqCY8xhVEevx/RsBhgS03f4S+sguvjUrBGC5c7LSrQrDEeqSbHufnvHflEELHP9GIxwJTM4E0H7QSvzHCYCkgHg17Js6VF6vnBmA1hBIexfKb4SfMHLejv5L2Qdhrhd/FBMnBtoqOM9hWLTyQ+sJISx/KS7ZxRNUGv71FMkVytKblGacubvYGIBpTPZCaZR69dkTTOeUSvtKg6i5qAfslN5CAt3QKfZYouZLiONzYTVzsRi/uaf1TjyH0qHrCuT4gVBNuuXvp4N7/OsNaCfC1YnXZa7KXjsN9M4eOTuNYEpjesAOzC7jEUTujfok/7kCICVDwEmIl4Cf/bkj32TxZKf0NiwjQB0BBnMmjliW7EzEv4CaMlVdxG7DwKz3465qWJmJrHCBYNAQDu0RWR7r+MI7+N+jL56twhozXE+9yp/JdERFc6bV+x3DKz203WsQG4hp5qfA3+SqLvgcz6NE9fhoAVZWXg9uJLCynxG/0JxfyR7gjPdG4DKj6i5WCMbf3itDBI9EtKkqQT0BeLph6NkNGfGxBCSvCW+smmsy7mDv5JbHd9m4zH0kk/IlayX+wIfDkzRBZKnKiw==|920 \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index ba39fc98..c0caee9e 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/SchedulerTasks/仓库新增事件.json b/SchedulerTasks/仓库新增事件.json new file mode 100644 index 00000000..640bd661 --- /dev/null +++ b/SchedulerTasks/仓库新增事件.json @@ -0,0 +1,122 @@ +{ + "Name": "仓库新增事件", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.EndDBInsertTriggerSaveData, ServerDesignerCommon", + "DataParamName": "变更数据", + "TableNameParamName": "数据表名", + "PrimaryKeyParamName": "主键", + "OperatorParamName": "操作人", + "OperationTimeParamName": "操作时间", + "SelectTables": [ + "Git仓库表" + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "仓库", + "TableValue": { + "TableName": "Git仓库表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "5ce51b6f-356c-45ae-b319-9d17473fe305", + "BindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "仓库ID", + "GUID": "4df73fd8-6f4a-4494-a420-438f7ac6cae8" + }, + "ColumnName": "仓库ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "Git仓库表", + "ColumnName": "ID", + "GUID": "756ffb58-1344-4902-8def-9c021e71204a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主键.ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "679ba12e65b74705b0d6f257963a2e23" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步仓库的所有提交", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=仓库.仓库ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + } + } + ], + "ID": "0cddff84-18ce-4ed1-9c98-b82ee9321acf" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "仓库不存在" + } + ], + "ID": "cb44fec5-9b34-41a0-b1d2-e2a9f58f3a81" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/同步一个仓库到表.json b/ServerCommands/Gitee/同步一个仓库到表.json index 9f3a35c1..6c04771c 100644 --- a/ServerCommands/Gitee/同步一个仓库到表.json +++ b/ServerCommands/Gitee/同步一个仓库到表.json @@ -317,7 +317,7 @@ ] } ], - "ID": "86c56d0c-4d09-48e4-9eb0-96b808d89dbe" + "ID": "ca71c4d3-299e-446c-8353-3cbe10d02cf9" }, { "CommandList": [ @@ -452,38 +452,12 @@ ] } ], - "ID": "e63f93a5-1f2f-4286-bcf3-6b015d3f4e01" + "ID": "b433409a-d06e-4b6e-9c2c-bfa80d8d309a" } ] } ] }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "同步仓库的所有提交", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "仓库ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=仓库ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "分支名" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -561,7 +535,7 @@ "Message": "仓库创建并订阅成功！" } ], - "ID": "ee322151-c151-4ca2-b21c-5fc4927829e4" + "ID": "716dc202-3922-45da-9fd3-e013b582bfd6" }, { "CommandList": [ @@ -574,12 +548,12 @@ } } ], - "ID": "a6276d3e-6fe9-418f-9a1e-f865463db454" + "ID": "ebc5303a-73aa-4cab-82c1-9c3b31bd4790" } ] } ], - "ID": "25642aaf-c275-4125-a6d2-766bca9ddd85" + "ID": "c99f5e6b-f975-4b3f-8ebd-ca9feac5ad27" }, { "CommandList": [ @@ -589,7 +563,7 @@ "Message": "仓库创建成功!" } ], - "ID": "1a1d7a39-1b49-42e8-aef8-47796c021d26" + "ID": "084ac9fe-56a6-4e20-bdaa-510ec487c06a" } ] } diff --git a/ServerCommands/Gitee/同步仓库的所有提交.json b/ServerCommands/Gitee/同步仓库的所有提交.json index 230e5b4e..17c233c5 100644 --- a/ServerCommands/Gitee/同步仓库的所有提交.json +++ b/ServerCommands/Gitee/同步仓库的所有提交.json @@ -26,11 +26,12 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "33487312" + "TestData": "32969134" }, { "Name": "分支名", - "DataValidationInfo": {} + "DataValidationInfo": {}, + "TestData": "master" } ], "InvokeTriggerTestData": { @@ -307,7 +308,7 @@ "WithinLoop": true } ], - "ID": "5330b11e-70b9-49d4-acf3-fd571818c3a5" + "ID": "02b1bc06-6b08-40f3-9940-346b98d114ba" }, { "CommandList": [ @@ -580,17 +581,17 @@ ] } ], - "ID": "caa36840-678a-44ca-b4ae-aefab93d8a65" + "ID": "583c643e-f5ed-467b-97ef-dc5b1013ef86" } ] } ], - "ID": "97673824-c1d9-4d12-8214-072c500d6377" + "ID": "b79cbc00-24c6-4396-b809-e5d5d03123e4" } ] } ], - "ID": "3897beac-9b94-4122-9c8c-eb8fa2230708" + "ID": "943c23ad-dc8d-40a1-9219-2b9e1ad1cc3e" } ] } @@ -600,7 +601,7 @@ ] } ], - "ID": "0489304b-393a-4de6-86e0-5aa25b1997dc" + "ID": "ba22b6aa-ec8d-4aa0-a0a8-3560fddecb07" } ] } @@ -635,7 +636,7 @@ } } ], - "ID": "efa475d6-8b00-4c11-8931-c9c13b83a6dd" + "ID": "cc2f7d06-2810-4f50-89ae-4fb850629e1e" }, { "CommandList": [ @@ -651,12 +652,12 @@ } } ], - "ID": "26befa33-2aff-46d8-8457-796f788d0c15" + "ID": "97be4a8e-96bf-458a-bc44-7f0554bd0fa2" } ] } ], - "ID": "4b49cfde-63e1-487e-aac9-b5d716fb47c7" + "ID": "90295fd0-f9ae-42cd-b4c0-49f2a00fb536" }, { "CommandList": [ @@ -666,7 +667,7 @@ "Message": "仓库不存在或尚未设置拉取人员" } ], - "ID": "7e112ca2-8e15-48b9-8f5b-10052ac14df8" + "ID": "5549cfc8-9683-4201-90ac-dfb52fbaadc9" } ] } diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index a6d34902..9a5c53ff 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -43,7 +43,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "51c6dcbf-fe8b-46d8-bfb4-191d546a0327", + "GUID": "0c58d519-5722-4971-b425-4dd9cde10693", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -52,7 +52,7 @@ "ColumnName": "项目ID" }, { - "GUID": "cddf0559-1f01-4e67-b93c-bb1e34e4dcc8", + "GUID": "c27895d0-8cfc-4b48-bf35-974a06bf7bda", "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", @@ -61,7 +61,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "cd690ee7-a6c5-4904-8bf4-713f93816b13", + "GUID": "ba805a37-b202-475f-8213-572c32498c28", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -80,7 +80,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "96e79e31-b1a4-4e37-8aee-350c62261957", + "GUID": "8f962fdb-572f-41f3-b839-82289968e80e", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -99,7 +99,7 @@ "ColumnName": "已分配任务工时" }, { - "GUID": "f0d7b2c3-9c10-4eeb-9c78-cf075c1ea8d8", + "GUID": "b1571501-4565-433c-bd5a-dd2d15732b81", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -113,7 +113,7 @@ "ColumnName": "项目经理" }, { - "GUID": "7685d2a7-b8b0-4fb3-a2c4-7e8388603e5b", + "GUID": "04346963-ece3-4343-aa49-00a623085c56", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -127,7 +127,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "a1ce946b-fc6c-44d0-ae82-c77c153f7cf6", + "GUID": "8373b1a5-4f1d-4430-9e6e-48bafa5fc9f2", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -136,7 +136,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "0bfff0dd-0c85-4e6e-ab5f-f1044a012c67", + "GUID": "d510731a-043f-4ac8-87a5-d01b59525866", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -150,7 +150,7 @@ "ColumnName": "严格模式" }, { - "GUID": "515d2b76-c70e-4d42-8127-6a735c321162", + "GUID": "7d9ce8af-1f30-408c-88b7-625e862d65a9", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", @@ -159,7 +159,7 @@ "ColumnName": "执行者" }, { - "GUID": "91f6a0c9-9f8a-4b9a-9ee8-839ecdd8197f", + "GUID": "8938b87e-a377-46f6-9c37-87274a3aaab1", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", @@ -168,13 +168,22 @@ "ColumnName": "任务类型" }, { - "GUID": "e9275819-440a-45b3-af94-bdaa6bc76357", + "GUID": "b5514c64-6496-44d5-abdc-971db1e10b77", "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", "GUID": "1fa6cc05-da37-4315-b822-951a8b751213" }, "ColumnName": "版本" + }, + { + "GUID": "eb4b96b1-7064-4679-b72d-bdf2268020db", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "8b3ea124-961b-4d9c-8342-d06a89709702" + }, + "ColumnName": "任务状态" } ], "SqlCondition": { @@ -192,7 +201,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "4f3f746acbeb428fab74f7968f28c1a5" + "ID": "44a682b6e37b4e54bdb53729203bff36" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -216,7 +225,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "ac834d8a-0eeb-43b8-8582-69a68be39e1c" + "ID": "bf2669ee-8268-4141-88c6-5092715f3072" } ] }, @@ -242,7 +251,7 @@ "Message": "请指定任务执行者" } ], - "ID": "242a97f0-c582-4842-b744-c7a098212013" + "ID": "d21c1a97-d872-4e1a-b06b-1b27436a87b2" } ] }, @@ -268,7 +277,7 @@ "Message": "请指定任务类型" } ], - "ID": "3a216d5d-99dd-4dd3-a282-bc00d54cfcee" + "ID": "34d0d97a-62e1-45e9-a04e-41bfd5ed79a7" } ] }, @@ -294,7 +303,7 @@ "Message": "请为任务指定版本" } ], - "ID": "2d2b078e-53f1-4705-b7c8-f0a22dd0b252" + "ID": "9d17a551-b606-4c60-ba11-052c43baa59f" } ] }, @@ -346,7 +355,7 @@ "ID": "8f419b6c4a3f4fb5bcf81a653a34fefc" } ], - "ID": "7fda99b3-70fe-4e63-89f2-3942322080d6" + "ID": "dde09040-6523-468d-912a-68841b21044b" }, { "CommandList": [ @@ -421,7 +430,7 @@ "ID": "ac58e4cdd43c49fe9f9575e244e3479b" } ], - "ID": "4b25f998-e03f-443f-9ab1-d87d1e19288b" + "ID": "ba5b58f8-d131-4492-8c85-f0bdf00093ac" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -455,12 +464,12 @@ } } ], - "ID": "d0a8e6e6-79f4-41db-877f-4a5b2dc75c5a" + "ID": "c2401842-ea6c-4e2c-b538-de78e6ccaf99" } ] } ], - "ID": "8d75672a-242b-43ad-b11c-9f86a71f6b09" + "ID": "4b8fc3a1-7364-41e8-aca3-5492484a2ddb" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/任务/变更任务状态.json b/ServerCommands/任务/变更任务状态.json index f9fe964d..86ce5422 100644 --- a/ServerCommands/任务/变更任务状态.json +++ b/ServerCommands/任务/变更任务状态.json @@ -23,17 +23,18 @@ "Parameters": [ { "Name": "任务ID", - "DataValidationInfo": { - "IgnoreBlank": false - } + "DataValidationInfo": {}, + "TestData": "8" }, { "Name": "状态码", - "DataValidationInfo": { - "IgnoreBlank": false - } + "DataValidationInfo": {}, + "TestData": "2" } - ] + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } } ], "Commands": [ @@ -49,7 +50,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "e602e99c-35d1-4c39-94c1-f791b8c74977", + "GUID": "56bf3a1a-b506-4531-9d01-f209f6e2f7b3", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -58,7 +59,7 @@ "ColumnName": "项目ID" }, { - "GUID": "697205fa-eca2-4d8e-b676-19c18b5632d5", + "GUID": "a2c50e9a-2c0f-4d7e-b43e-19456cb3c5ef", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -67,7 +68,7 @@ "ColumnName": "任务名称" }, { - "GUID": "dba2c73d-471c-484d-8042-39c8bd3d42a7", + "GUID": "c5ee4845-58d1-4e51-95c0-aef99ba9da4c", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", @@ -76,7 +77,7 @@ "ColumnName": "任务状态" }, { - "GUID": "8aeaedfb-0277-41ab-830c-61184017a68c", + "GUID": "f0106ccd-42db-42c2-862f-a612166fa173", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", @@ -90,16 +91,16 @@ "ColumnName": "任务状态文本" }, { - "GUID": "68abe158-db9d-4ec2-b6a5-ba55af274144", + "GUID": "63a4f69f-e22f-4f00-a188-6ffbb5607a6a", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", - "GUID": "1feee22d-be59-401f-bf83-954a38a92dbb" + "GUID": "3f3806fd-032f-4750-925c-83a5dfe69bb0" }, - "ColumnName": "执行者" + "ColumnName": "任务负责人" }, { - "GUID": "c8f0b7e7-22a9-4486-862c-71455f8ddf8b", + "GUID": "e6246a80-54cc-403c-9f9b-566de00dc7b1", "BindingInfo": { "TableName": "任务表", "ColumnName": "开始时间", @@ -108,7 +109,7 @@ "ColumnName": "开始时间" }, { - "GUID": "c1947396-b0ec-428d-8967-98acb3cd7949", + "GUID": "5ffd390a-0c35-4cca-a52b-af7231ea8381", "BindingInfo": { "TableName": "任务表", "ColumnName": "结束时间", @@ -117,7 +118,7 @@ "ColumnName": "结束时间" }, { - "GUID": "9ee1dc85-a39d-469a-a0e7-7032d6ea7b33", + "GUID": "3206d98b-fd30-41e5-8041-bfd090722e03", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", @@ -138,9 +139,10 @@ "SerializeProperty": "=任务ID" } }, + "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "aca960b8f6fa4b4ba9f94d2990702543" + "ID": "3573b52ffc3742a7bab1dc862b262276" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -276,12 +278,12 @@ } } ], - "ID": "7c2ea296-a691-4669-ad99-4d5a5dd5b598" + "ID": "92023045-2efd-4732-8b87-9ca3defda20e" } ] } ], - "ID": "962e701e-7d81-4148-acb1-9a65b826705a" + "ID": "7d8aff32-3014-49cd-9da4-bab045b1264e" }, { "Condition": { @@ -306,7 +308,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.执行者" + "SerializeProperty": "=任务信息.任务负责人" } }, "value": "%Null%" @@ -318,12 +320,12 @@ "Message": "任务执行者不能为空" } ], - "ID": "f0330e02-9e98-4324-8976-7c6206ee72b7" + "ID": "bd111c49-ad7a-4b6e-84d1-b05b498e2dbc" } ] } ], - "ID": "44730129-e979-457f-a992-5565fb61f8e0" + "ID": "2428b906-61bc-43c0-9c84-e76628d3aeb9" }, { "Condition": { @@ -348,7 +350,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.执行者" + "SerializeProperty": "=任务信息.任务负责人" } }, "value": "%Null%" @@ -360,12 +362,12 @@ "Message": "任务执行者不能为空" } ], - "ID": "4ebc2f7e-fe65-482f-9185-0c662cfc5a7c" + "ID": "dcc4a40e-b48f-4392-8ce3-672c386885c0" } ] } ], - "ID": "bb4437ad-ef49-47ab-ae6a-6b51a67f03f4" + "ID": "fa9a7a72-46f8-4771-8846-5cfd3a4d37ce" } ] }, @@ -394,7 +396,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "b6b9fc50-b337-45f0-9d44-6a04a85738ec" + "GUID": "6edbee6e-922a-4904-b1f8-0bc7b5a7eccd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -413,7 +415,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "82e1c9b2-262a-4b83-b739-bebfd46ad1ed" + "GUID": "47dbb777-470d-4222-b8ce-3290bf908349" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -424,7 +426,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "73537d3b-79a9-4417-85a4-b0497bd91cdf" + "GUID": "46dff42e-9185-48a4-a09c-b1b42df875bb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -435,7 +437,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "29bbefd3-fbee-46d3-916c-2ef8e1642935" + "GUID": "70d9cdae-463b-44d4-97ef-dedf26616565" }, "Value": "%CurrentUser%" } @@ -449,7 +451,7 @@ "Message": "操作成功" } ], - "ID": "81eff0f3-4fe1-4492-8076-7304cd450859" + "ID": "23001280-0179-417f-b1f2-a0da785da4e9" }, { "CommandList": [ @@ -459,20 +461,25 @@ "Message": "操作成功" } ], - "ID": "93a5f31e-80c2-4290-8eac-cc48ea96a670" + "ID": "2610caad-cd61-4070-9b64-aaec12185d7d" } ] } ], - "ID": "2b9965a6-f0a0-4196-9e9a-865762e27169" + "ID": "57e92f57-da41-4500-8b9c-4f427627d742" }, { "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon" + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务ID=\"&任务ID&\"，不存在。\"" + } } ], - "ID": "aa38542b-fa52-4249-be6c-71e0669c59d2" + "ID": "63bd9e3b-df5b-4b3a-8434-f5238015049a" } ] } @@ -480,6 +487,44 @@ }, "CatchCommandPart": { "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "88ca8e09-2124-454f-aaf5-7f2abb7b9e88" + }, + "Value": "修改任务状态" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "d3c4570e-a309-413b-95f4-09c91d5308cd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务ID=\"&任务ID&\"，状态码=\"&状态码" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "acb845cd-d40d-4c4e-9709-0601c6e6ff8f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": { diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json new file mode 100644 index 00000000..992ccdbb --- /dev/null +++ b/ServerCommands/任务/新增任务.json @@ -0,0 +1,533 @@ +{ + "Name": "新增任务", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "任务名称", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "父任务ID", + "DataValidationInfo": {} + }, + { + "Name": "负责人", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "开始日期", + "DataValidationInfo": {} + }, + { + "Name": "结束日期", + "DataValidationInfo": {} + }, + { + "Name": "任务分组", + "DataValidationInfo": {} + }, + { + "Name": "任务类型", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "任务版本", + "DataValidationInfo": {} + }, + { + "Name": "预算工时", + "DataValidationInfo": {} + }, + { + "Name": "任务说明", + "DataValidationInfo": {} + }, + { + "Name": "收集反馈", + "DataValidationInfo": {} + }, + { + "Name": "备注", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "f7032606-edf3-49fc-884b-acddb188db12", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "ddb9f866-120e-4522-9dd6-419115b3134e" + }, + "ColumnName": "层级" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "35efae29-d3e2-4711-8684-720338d259e6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "076753af241549358e05a551b7b0db10" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务层级", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.层级+0" + }, + "ID": "d01552992a0c4569864d9ac2ed82875b" + } + ], + "ID": "7e2a1dd5-2f72-4080-ade7-cf9fbdb84b76" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务层级", + "ParameterValue": "0", + "ID": "100407c5ad3545a4927cc51a64cc94ba" + } + ], + "ID": "5dd917ef-5c59-480e-ac2f-df0aebe94bc2" + } + ] + } + ], + "ID": "7e2b7fa5-5bc7-4015-abc7-9f003a4cf8aa" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务层级", + "ParameterValue": "0", + "ID": "918e2a12022e4e8080c14ece366ea9bb" + } + ], + "ID": "240fe6ee-509b-46d8-b9f6-e5d42777b55d" + } + ] + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f9ec393d-8d91-4100-a061-4000a1efa466" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "8abe972a-9e9a-4284-b5aa-ec017f7bd5bc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "bf9ce170-29db-4e2b-9a8f-cc0c607c0b40" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务层级+1" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "96c8814e-76d4-4f80-a544-814645d51e74" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务名称" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "71a6f6ea-dfa3-4934-8c3f-11f41f2d0e76" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=负责人" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "8b8f4a4e-4f9c-40ff-87d6-b0263672a9fb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "9f9baac3-9371-4c73-b1c6-a74905a322f5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "80c6447d-fbd3-4de8-99ba-eeea1e771879" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务类型" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "8433c670-ecc4-4900-9afc-5cd8f7cdcaf9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务分组" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "0c84b620-db82-480e-99a6-3d4b9c144aac" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "292b556c-dffd-479c-909b-d5e35b76de63" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务说明" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "033feb75-297d-4008-8770-ec851df03961" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "66e19b74-0698-48d2-b4dd-f4632946aac2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "进度", + "GUID": "3e4340de-7c19-4f70-bcff-7dc04ef58914" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "功能名称", + "GUID": "8141a094-e012-4617-8815-82567e51efc4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务名称" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "功能描述", + "GUID": "10903cc6-fe1e-4ac0-9fd8-40a3a68bf474" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "收集反馈", + "GUID": "42892121-82fd-470e-862d-6ff11e3ff6d9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收集反馈" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "e0cfab6c-5942-43ba-a89c-1dffaba21de9" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "新任务" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "82a795d5-dff0-42c0-ba86-ba438076c0ad" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "dc5bfad5-ecd8-4ba8-aa05-74efe3e78b74" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务成员", + "GUID": "c3c840c1-c010-481b-a4ea-f0ef86925a67" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=负责人" + } + } + ], + "ParamNameToSaveNewRowValue": "新任务" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功", + "CustomReturns": [ + { + "ReturnPropertyName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "新增任务流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务名称" + }, + "SelectedTable": "任务表", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "c8a22ced-db3f-4888-afe4-ed4035b5fc6a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } + }, + "ReturnResultName": "发起流程结果", + "Disabled": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增任务成功", + "CustomReturns": [ + { + "ReturnPropertyName": "任务ID" + } + ] + } + ], + "ID": "8157c39f-9833-46a2-90c5-6e2ba77dc18b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "发起流程失败，请手动重新发起！", + "CustomReturns": [ + { + "ReturnPropertyName": "任务ID" + } + ] + } + ], + "ID": "9895df7f-af90-4143-b94a-8926d084ae89" + } + ], + "Disabled": true + } + ], + "ReturnProperties": [ + { + "Name": "任务ID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index 135c9b34..de483891 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "51d29667-c8fa-4ac7-9a80-84635b43c671", + "GUID": "39dab506-e2ad-412b-9975-9de2594ff0c5", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "1178509c-4606-4631-9f47-3ac0c387dd5c", + "GUID": "0bf5e3d4-b8b3-48de-af22-cd832c4b4483", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -79,7 +79,7 @@ "ColumnName": "任务名称" }, { - "GUID": "595928d5-c5e2-4a0b-b9c5-1fb1b6994092", + "GUID": "e31a79b4-5df6-4605-bf94-041384467291", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -88,7 +88,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "39dd63aa-a9c6-4646-a0a1-d16bad89b4ce", + "GUID": "a86844a7-eaa6-40df-bf96-e4e505bd9a5b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -97,7 +97,7 @@ "ColumnName": "任务状态" }, { - "GUID": "0f951348-a489-4498-b0df-c01a04a35554", + "GUID": "fa19a3b2-6f1b-4d06-b704-a21bc83a679c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -111,7 +111,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "b8d887d3-7e95-450e-8c41-55fe618bee11", + "GUID": "3e739d34-6043-4507-a64a-bfd99fdf804c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -125,7 +125,7 @@ "ColumnName": "严格模式" }, { - "GUID": "df02b131-76d0-4fc6-8c7d-4a2485886371", + "GUID": "8a5fde98-bfd2-49ec-a770-a31211258766", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -139,7 +139,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "518fccab-2ffd-47eb-a849-fc448c36ed5d", + "GUID": "b00b7fc4-00f6-467b-9475-2d387b010d54", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -153,7 +153,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "b1e1ddce-0b10-4c9e-876b-8168a0b1827e", + "GUID": "c318a143-56b7-4628-b82c-467f4f506d43", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -167,7 +167,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "4b56bc02-6a36-44c9-861b-ef6f83ba1e51", + "GUID": "0a1b96c1-f955-4ce8-ae6d-3d1ce15d3ad3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -181,7 +181,7 @@ "ColumnName": "提成系数" }, { - "GUID": "74dfdd5f-cf5c-4a78-b999-d362ed94b09d", + "GUID": "797a4cf1-880a-4657-bd17-166491e52aa6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总计划工时", @@ -190,7 +190,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "561c6627-404a-4cd6-8110-221e757e6fde", + "GUID": "77eb05f5-194d-42b2-8ed0-24fe75365b7b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总实际工时", @@ -214,7 +214,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "de7afa1d5ff1408fb92f64a23e648572" + "ID": "9f98969e7d3c42dc958ba4881eba224b" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -487,7 +487,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "c9ed015e-b153-4a1e-90f9-f2b77fd41e7f" + "ID": "4c12665c-c607-436f-89b5-5b4635f5db8c" }, { "Condition": { @@ -520,7 +520,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "02ae84f0-3eff-43e7-a7a6-3e2edc3780f9" + "ID": "f6f21cf9-4adc-4539-ae48-51452fc9915c" }, { "Condition": { @@ -553,7 +553,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "31512194-2720-46c4-a700-bc507e1e321c" + "ID": "affca115-f5d7-43b7-a084-917a09a0f706" }, { "CommandList": [ @@ -570,13 +570,13 @@ "ID": "eb0ba1839ebc4ec58750e971080fc72b" } ], - "ID": "60c0485a-c34d-4729-af35-6c8a1ba45269" + "ID": "8f632eec-184f-4795-9152-56faa3200eb8" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "d12bb755-e110-459f-b338-04f09e322ecd" + "ID": "0235a465-641e-4804-ad1d-8b56aab31dd3" }, { "CommandList": [ @@ -596,7 +596,7 @@ "ID": "2eafc4d65af44d18adfcd21c68734df8" } ], - "ID": "71c0233d-4246-4440-84ac-e996ce1ad688" + "ID": "973d5a24-b65c-49c7-8f51-ff5129355e80" } ], "Comments": "计算成员的时薪" @@ -627,89 +627,12 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时分配方式" + "SerializeProperty": "=任务信息.任务状态" } }, - "value": "1" + "value": "2" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "个人工时情况", - "TableValue": { - "TableName": "View_任务工时统计", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "1b238274-dd6b-4c25-82ac-9b61d4efba32", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" - }, - "ColumnName": "任务ID" - }, - { - "GUID": "1f313c9e-4960-484d-984f-75ab3965ccf5", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "37b1cd46-749c-4870-9e65-639974e237b4" - }, - "ColumnName": "总计划工时" - }, - { - "GUID": "bd3ba593-9a1e-4864-b038-670ae01756f1", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" - }, - "ColumnName": "总实际工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "4bd4f915-e792-4219-ad86-6602ef9080bd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - } - ] - } - }, - "ID": "bd1036451d524ce98a641c7eac350ccb", - "Comments": "从视图统计项目的信息" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "个人工时余额", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时" - }, - "ID": "29e1c2c06f2e427bad0ccd1c37772485" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -720,113 +643,305 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时余额" + "SerializeProperty": "=任务信息.工时分配方式" } }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - }, - "compareType": 4 + "value": "1" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "核定工时", + "ParameterName": "个人工时情况", + "TableValue": { + "TableName": "View_任务工时统计", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "1b238274-dd6b-4c25-82ac-9b61d4efba32", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" + }, + "ColumnName": "任务ID" + }, + { + "GUID": "1f313c9e-4960-484d-984f-75ab3965ccf5", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "37b1cd46-749c-4870-9e65-639974e237b4" + }, + "ColumnName": "总计划工时" + }, + { + "GUID": "bd3ba593-9a1e-4864-b038-670ae01756f1", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" + }, + "ColumnName": "总实际工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "4bd4f915-e792-4219-ad86-6602ef9080bd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] + } + }, + "ID": "bd1036451d524ce98a641c7eac350ccb", + "Comments": "从视图统计项目的信息" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "个人工时余额", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时" }, - "ID": "bde7738eb3154f93a0e189ea107db3ea" + "ID": "d4e74f0bc6954a9db41a98ed631026b8" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时余额" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "核定工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时" + }, + "ID": "bde7738eb3154f93a0e189ea107db3ea" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "核定工时说明", + "ParameterValue": "个人工时余额不足，按剩余工时核定！", + "ID": "58bcc74765f1449baceb214856d42160" + } + ], + "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", + "ID": "23553190-286f-4cf3-991d-056e1f5e0046" + } + ] + } + ], + "Comments": "如果分配到人头，则判断该人总计划工时还够不够", + "ID": "2d3c9a6e-0e1f-4be2-a275-4a7ea63fe36a" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.工时分配方式" + } + }, + "value": "3" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务工时情况", + "TableValue": { + "TableName": "View_任务工时统计", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "88e5a9aa-873c-46c3-b76f-69a424956526", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" + }, + "ColumnName": "任务ID" + }, + { + "GUID": "5fed6798-5151-4540-b566-d913b4615d93", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "37b1cd46-749c-4870-9e65-639974e237b4" + }, + "ColumnName": "总计划工时" + }, + { + "GUID": "a30f02c0-4c0f-4308-a747-49bd5ac545dc", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" + }, + "ColumnName": "总实际工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + }, + "ID": "9dac211ac8804f90a07ac0a1924d99ca", + "Comments": "从视图统计项目的信息" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "核定工时说明", - "ParameterValue": "个人工时余额不足，按剩余工时核定！", - "ID": "58bcc74765f1449baceb214856d42160" + "ParameterName": "任务工时余额", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" + }, + "ID": "b8f71de2a6994493970617644965cf31" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时余额" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "核定工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" + }, + "ID": "08d1a4cf3838487ea7f3a88f433c1b4a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "核定工时说明", + "ParameterValue": "任务工时余额不足，按剩余工时核定！", + "ID": "8ebb8fba5ce4400ca854cb1156c86f66" + } + ], + "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", + "ID": "129f7c42-0004-452e-b3c0-c474309dbf62" + } + ] } ], - "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "347f6c15-2879-4049-9c22-9b1fe9ac797d" + "Comments": "如果是共用任务工时，则查看任务计划工时够不够", + "ID": "82893b6d-1788-4486-8364-9d8c7b3f300a" } ] - } - ], - "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "4189a1c9-c394-4568-a101-a494d9410881" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时分配方式" - } }, - "value": "3" - }, - "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务工时情况", + "ParameterName": "项目统计信息", "TableValue": { - "TableName": "View_任务工时统计", + "TableName": "View_项目统计信息", "TableValueType": 1, "BindingInfos": [ { - "GUID": "88e5a9aa-873c-46c3-b76f-69a424956526", + "GUID": "5c1bf627-4570-41ca-b626-c506b3a2d24f", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" }, - "ColumnName": "任务ID" + "ColumnName": "项目预算费用" }, { - "GUID": "5fed6798-5151-4540-b566-d913b4615d93", + "GUID": "839f4ce0-15f4-4ac3-b60a-ac60f4f97665", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "37b1cd46-749c-4870-9e65-639974e237b4" + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" }, - "ColumnName": "总计划工时" - }, - { - "GUID": "a30f02c0-4c0f-4308-a747-49bd5ac545dc", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" - }, - "ColumnName": "总实际工时" + "ColumnName": "总成本" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1" + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" + "SerializeProperty": "=任务信息.项目ID" } - } + }, + "TopCount": "1" }, - "ID": "9dac211ac8804f90a07ac0a1924d99ca", + "ID": "65e64feb95fa49a69eff18abf13b2d81", "Comments": "从视图统计项目的信息" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务工时余额", + "ParameterName": "预测本次产生成本", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" + "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" }, - "ID": "b8f71de2a6994493970617644965cf31" + "ID": "83e6abcf3cd543139068512f4079445a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -838,240 +953,179 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时余额" + "SerializeProperty": "=预测本次产生成本+项目统计信息.总成本" } }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" + "SerializeProperty": "=项目统计信息.项目预算费用" }, - "compareType": 4 + "compareType": 2 }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "核定工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" - }, - "ID": "4fafcec6dc9b424a9a9caff2cb9c43af" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "核定工时说明", - "ParameterValue": "任务工时余额不足，按剩余工时核定！", - "ID": "8ebb8fba5ce4400ca854cb1156c86f66" + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。", + "CustomReturns": [ + { + "ReturnPropertyName": "提交工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + } + }, + { + "ReturnPropertyName": "核定工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时" + } + }, + { + "ReturnPropertyName": "提成系数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } + }, + { + "ReturnPropertyName": "计算时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "ReturnPropertyName": "核定收益", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时*计算时薪*提成系数" + } + }, + { + "ReturnPropertyName": "时薪来源", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=时薪计算来源" + } + }, + { + "ReturnPropertyName": "核定工时说明", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时说明" + } + } + ] } ], - "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "0b981156-3a4e-4de7-930e-a6822be0525a" + "ID": "a3c3f585-bd40-4e88-a513-02a355850bc0" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "以下是本次报工的核定数据，请确认无误后提交", + "CustomReturns": [ + { + "ReturnPropertyName": "提交工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + } + }, + { + "ReturnPropertyName": "核定工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时" + } + }, + { + "ReturnPropertyName": "提成系数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } + }, + { + "ReturnPropertyName": "计算时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "ReturnPropertyName": "核定收益", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时*计算时薪*提成系数" + } + }, + { + "ReturnPropertyName": "时薪来源", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=时薪计算来源" + } + }, + { + "ReturnPropertyName": "核定工时说明", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时说明" + } + } + ] + } + ], + "ID": "7ea538ef-829c-44cc-b74a-261128ed5c8e" } ] } ], - "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "fcfde3f5-0254-416d-8ddd-0a3ab08323dc" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目统计信息", - "TableValue": { - "TableName": "View_项目统计信息", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "75d4b655-e599-47e4-8c9c-a27eafa7a9cb", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算费用", - "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" - }, - "ColumnName": "项目预算费用" - }, - { - "GUID": "4657e91e-3cd7-4a82-a79c-a0fab2e0cac9", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总成本", - "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" - }, - "ColumnName": "总成本" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } + "ID": "984ece6b-a304-4ed3-b74a-f4468f884e7f" }, - "TopCount": "1" - }, - "ID": "9d817f8a12e0490faa4817839ddd3330", - "Comments": "从视图统计项目的信息" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预测本次产生成本", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" - }, - "ID": "0b80da88679c4f178aa22d6333666401" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预测本次产生成本+项目统计信息.总成本" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计信息.项目预算费用" - }, - "compareType": 2 - }, "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。", + "Message": "当前任务状态尚不允许报工", "CustomReturns": [ { - "ReturnPropertyName": "提交工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - } + "ReturnPropertyName": "提交工时" }, { - "ReturnPropertyName": "核定工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时" - } + "ReturnPropertyName": "核定工时" }, { - "ReturnPropertyName": "提成系数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" - } + "ReturnPropertyName": "提成系数" }, { - "ReturnPropertyName": "计算时薪", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } + "ReturnPropertyName": "计算时薪" }, { - "ReturnPropertyName": "核定收益", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时*计算时薪*提成系数" - } + "ReturnPropertyName": "核定收益" }, { - "ReturnPropertyName": "时薪来源", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=时薪计算来源" - } + "ReturnPropertyName": "时薪来源" }, { - "ReturnPropertyName": "核定工时说明", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时说明" - } + "ReturnPropertyName": "核定工时说明" } ] } ], - "ID": "935dd64c-f2b8-4028-8f0f-ce63ef2489cc" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "以下是本次报工的核定数据，请确认无误后提交", - "CustomReturns": [ - { - "ReturnPropertyName": "提交工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - } - }, - { - "ReturnPropertyName": "核定工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时" - } - }, - { - "ReturnPropertyName": "提成系数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" - } - }, - { - "ReturnPropertyName": "计算时薪", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } - }, - { - "ReturnPropertyName": "核定收益", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时*计算时薪*提成系数" - } - }, - { - "ReturnPropertyName": "时薪来源", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=时薪计算来源" - } - }, - { - "ReturnPropertyName": "核定工时说明", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=核定工时说明" - } - } - ] - } - ], - "ID": "bc661f54-29f0-4057-8a35-2ab125f2de75" + "ID": "145f4305-61e9-4e3e-82b7-01adbab2c9ef" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "2feed033-ba7d-4f12-ab19-6291a2e35524" + "ID": "e470f225-553e-4875-95a1-1284b95da293" }, { "CommandList": [ @@ -1128,12 +1182,12 @@ ] } ], - "ID": "4d2d8bc6-9ed2-4de0-b162-702afb3d01cf" + "ID": "ca5d6b97-14f4-4d16-8eea-fafd5a276082" } ] } ], - "ID": "1c07d0f0-a59d-472c-856b-77b65143d27b" + "ID": "65a59501-45ac-46d8-b085-4362b20c3e50" }, { "CommandList": [ @@ -1166,7 +1220,7 @@ ] } ], - "ID": "b59cbb75-8ff9-4413-8ecd-2886d5a1e03c" + "ID": "35a4d139-2b65-46f4-aa60-5ff1a634b67a" } ] } diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index e174195f..33573147 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -224,6 +224,19 @@ "DetailTableName": "任务成员表", "Name": "成员数量", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "剩余工时", + "GUID": "d0482e3c-984a-490a-a65d-b1d25f20890b" + }, + "AggregateFunction": 4, + "DataColumnName": "剩余工时", + "DetailTableName": "View_任务工时统计", + "Name": "总剩余工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 5e1d2aa9..b0ebffc1 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -160,6 +160,7 @@ ], "ExternalDatabaseInfo": { "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index c3e95265..f2c1fd7b 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -5,7 +5,6 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", "permissionResource": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", - "enabledTypes": 2, "isExternal": true, "detailTables": [ { diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 3db2073d70a8dc601cb5b079d29b7911219ada65..4d636ff5aad9fc330eddac26145137ea01e44fde 100644 GIT binary patch delta 242 zcmZoTpww_cX@a!id&6Brd)_*MCZHY+MTbQTo@ z3#qHI6lCNlrRF&l7V0JE=T5iDXFLHkV#;*(0+122_@@Ak$l#y8pq`P1LtLDdnUPUU ztR2YPzM!5d(t%Na`>*{>Tnn&j$!B(C2kTH1Yrm7v48$xz%nHP8K+L}VPCkc<0RZVz BKmh;% delta 162 zcmZoTpww_cX@az%2Ll5`7ZAgM$3z`tMvsjNzw8)AH%Hss2=E!3ndzCDT3VVK7@L?I zH81twzSN&FUVvGE-)1^{0;A$)MFkQ5={EU{CxAi=rn47-g(~>l7t}LuUr^5!>A)zv m{nvgbt_7&_)2HM!JGMW}X9i*xAZ7((HXvr-{xF|I-T(lQtT3Jc