From cffb8ffdaf2041dbca1884998befe40cb88d37b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Mon, 24 Jun 2024 18:19:12 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=8D=E9=A6=88=E7=BB=86=E8=8A=82","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":23,"Name":"TableView/=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2=E7=AE=80=E7=BA=A6=E8=A7=86=E5=9B=BE?= =?UTF-8?q?"},{"State":1,"Type":7,"Name":"Table/=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E7=99=BB=E8=AE=B0=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=8F=8D=E9=A6=88"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E5=B7=A5=E5=8D=95=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9F=A5=E8=AF=A2"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E5=A4=84=E7=90=86=E5=8F=8D=E9=A6=88=E5=B7=A5=E5=8D=95"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E4=BE=A7?= =?UTF-8?q?=E6=A0=8F"},{"State":1,"Type":1,"Name":"PCPage/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E7=AE=A1=E7=90=86"},{"State":1,"Type":27,"Name":"Serv?= =?UTF-8?q?erCommandPrivate/=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=8D=E9=A6=88"},{"State":1,"Type":28,"Name":"Proc?= =?UTF-8?q?essItem/=E5=8F=8D=E9=A6=88=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B"?= =?UTF-8?q?},{"State":1,"Type":15,"Name":"ServerCommand/=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=90=E5=91=98"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 122 ++-------------- Pages/da845ef0f1cf4586a29964e862551d7.json | 23 ++- Pages/任务/任务-侧栏.json | 39 +++-- Pages/汇报/汇报管理.json | 42 +++--- Pages/项目/项目反馈/处理反馈工单.json | 135 ++++++++++++++++-- Pages/项目/项目反馈/工单进度查询.json | 14 +- .../项目首页/项目首页-容器页面/项目反馈.json | 80 ++++++----- Process/反馈处理流程.bpmn | 34 ++--- ServerCommands/任务/添加任务成员.json | 34 ++--- ServerCommands/项目反馈/后端新增项目反馈.json | 133 +++++++++++++---- Tables/流程表文件夹/审批历史简约视图.json | 4 +- Tables/需求反馈/需求反馈登记表.json | 2 +- 12 files changed, 397 insertions(+), 265 deletions(-) diff --git a/.collaboration b/.collaboration index 02f132f7..f159f054 100644 --- a/.collaboration +++ b/.collaboration @@ -180,16 +180,7 @@ }, { "ModuleName": "TableView/审批历史简约视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:51:41.0247982+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\流程表文件夹\\审批历史简约视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Tables/用户", @@ -246,16 +237,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T18:11:39.1525268+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/反馈状态表", @@ -608,17 +590,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T18:10:54.2263336+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本管理", @@ -686,33 +658,11 @@ }, { "ModuleName": "PCPage/工单进度查询", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T18:00:56.9865777+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\工单进度查询.json", - "Pages\\项目\\项目反馈\\工单进度查询.rd", - "Pages\\da845ef0f1cf4586a29964e862551d7.json", - "Pages\\da845ef0f1cf4586a29964e862551d7.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T18:07:29.5779075+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -728,21 +678,7 @@ }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:26:27.96603+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-侧栏.json", - "Pages\\任务\\任务-侧栏.rd", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd", - "Pages\\b522ad93131845cf87553eda79dfd25.json", - "Pages\\b522ad93131845cf87553eda79dfd25.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", @@ -878,17 +814,7 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:33:43.2693179+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报/项目周报", @@ -1136,16 +1062,7 @@ }, { "ModuleName": "ServerCommandPrivate/后端新增项目反馈", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:49:41.9115032+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目反馈\\后端新增项目反馈.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/修改项目反馈状态", @@ -1213,17 +1130,7 @@ }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:59:32.0130356+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", @@ -2259,15 +2166,6 @@ }, { "ModuleName": "ServerCommand/添加任务成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:24:14.4017448+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\添加任务成员.json" - ] + "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/da845ef0f1cf4586a29964e862551d7.json b/Pages/da845ef0f1cf4586a29964e862551d7.json index 8f023614..0d691d40 100644 --- a/Pages/da845ef0f1cf4586a29964e862551d7.json +++ b/Pages/da845ef0f1cf4586a29964e862551d7.json @@ -114,7 +114,10 @@ } }, "1,4": { - "TemplateCellSource": "进度" + "TemplateCellSource": "进度", + "RulesGuidList": [ + "5efbdc23-b626-4eff-87ab-379f8bf4aeba" + ] }, "1,8": { "TemplateCellSource": "时间" @@ -180,10 +183,24 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "工单进度查询" + "ParentPageName": "工单进度查询", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.SpecificTextRule, ServerDesignerCommon", + "Value": "结束", + "GUID": "5efbdc23-b626-4eff-87ab-379f8bf4aeba", + "StyleInfo": { + "Foreground": "Accent 5 0", + "Underline": null, + "Strikethrough": null + } + } + ] + } }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//q/0VoiOSJBQJSG08AKytURJa7Ve1QczZHKJc1tAvPXxUWaG6BDSLfhQeCrR1u55j034FZePiC/XBV3aO3/cjNsTq2OwPgwFwM65z1i16jUgtUQrjPeeFE1ArnSq1civVZ096dxS4AdS69EZ8avs9Cpmyy/8qKFmpAUSpcwCw54GoCtcIKHUWBASvPKjKzt1UZIPNS+qxMb2+i+uRqdEMT7LjgbghRvOFsv0acWgFGbbKu0FF3sJOg3+lXg3HKacx6xe1vsrc8xHkzEgauCINfqAGA+hzCuemSg5CmhE+aMoVs7WU5KOqbQB/tqXM04j/MYrBEKd4lXUOiqex1GuO2q1KWJwU7ZFMxVA2YBYanzBqA2nv/45ZoZCCjlfNIf6BEfji4nwQnKO778jHsrhwhvzPdOjPbgAwCQcLPy05CqxQw7U0R/SktUnq+hM7Jc+YPQWs/fWmipP7tk1dtT2B8OIS9VFUhKL5Sl4aaDo5/ZhVR4tT+umEFtS+HBzTyuMTM2IpFvG/4zmoePvxuAxXBtFCHrF+ubXWpX7LlHMQ72auCpzq8SDHAaVluGkhw/swYlydGzkK0SwL0K+pYybXi35+gOneaJVr1BEB65HPq1GfKxoMGckLKyyBkLhz0x/QwtGjCkJIvF8CrJrC8EiZZLskHtZaciYhALAqTiB6w1wJMy1kZjFPt8NaQp2k8DvdOe6BReOyyXLWTPdOQ41Og0JP3qPmZmr5sHMaZZrV6FTKySwAR204HlOgfn6q2WYIdp0+DKKO6j7fVTwSjJPeR3GnR6iJKqOEZEfoTup1ShPw+TFwS3Fc0RwGr8VGknLcjCRIKcnhVsEb/ee1bAVVtqo45ozzg5Q7QpPBLdtxeMI01A3WSEYouIM2iRVlh7fUU3pJrU83y0NDjgMwvSKrgA==|920 \ No newline at end of file +}//tCRHQn+2aTxTtdRWngMm0dq7e4grgpM/US6A1ckQAmMIkvvHg1njduVMBglOXmPuta3lSL6ZaAhDZuT/PWuLJ6Ob4oLi08lD02hXMAb5eHhgppohIr4Cmi2PXrQDvjS7acSpR91hX9YSlocn60Ri9N08QwSoPBUtXU3GyNmEFruy4lfbFPay5cqc9AAsotfq9kCPLI4PzThi9TOFC3KCSZnRMR0u+0kbHz2eg34P8PX5KMz1j2BBbpcMZKt0prBhjgKQe4ZLaOtJaTv6bRuxwv7QlaCV8kJbbfdhqro0pxelyF//GWCr/dnLdEIG9PcidzDdy+Hy5VaZYE6NHOLlUoR2tsDVIFMhgNNUJprZjiYbR/XuuKENhvbsg6eW7z0XrzvamxJzkKALkfq0A/ZRsBTbrxTlqLS+lYV3F0yTf9qFDF4DW9Ia+DVDhDuHL4aJNdgRvGU+1hC7OGJvNG2NGYk0EGYkh9sUYFoXFeFLl5jMOXq/fhNmJguRmizEh7haLIl4KEa/r7cOIlHRtvd7o8bO6ydgJk2jqH4Lrkge8kLTQ86jyRoJz5LCqSl+F9rbeFaJo4CmXd/t1QtlmCy9oYhKw4ZnYGBUvK7+v/LjWNEKCyoUuj/vWh8/8wRDb0CQYhnau7xOFa3m0x9dy5WOb/EuIekdiol49uWzlzL53yEwORxe/bbrkZ+G6p7aKS9hNqDaKhhAQtkMsVhOAq5g1mjCCZ5ljEpMcxNLEkpATUxtwjY58XHyC1lHALnH2DUdvDzOA8dCreFnpr6Q4jY8VEsHF/eYnO9QhSgHnEQXlCl7s7ubFKHnjRB0M5cFHLMyD/PxiA+gS8SAYGnNdof5Fxnj+0FE+7reGdjcJlIimk4SEsEVRYx6ClGZYmCKYwrGfYEM+aX/5HosWhSihQNM5g==|920 \ No newline at end of file diff --git a/Pages/任务/任务-侧栏.json b/Pages/任务/任务-侧栏.json index 9c6acf40..f3eb7465 100644 --- a/Pages/任务/任务-侧栏.json +++ b/Pages/任务/任务-侧栏.json @@ -146,9 +146,13 @@ ], "ToolTip": "管理成员", "Size": 18, + "IsInvisible": true, "ImagePath": "设置.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "ab8e1569-c331-4349-bcaa-8a2610c13f2b" + ] }, "3,1": { "CellType": { @@ -269,7 +273,7 @@ "ID": "ead92b1c9df1498883eaa4adeefb5174" } ], - "ID": "3941c8f3-c8b2-422a-a6d1-b33850f8772f" + "ID": "dbf5fd00-957d-40ea-a2f4-a3d432b3cbf5" }, { "Condition": { @@ -301,7 +305,7 @@ "ID": "3b696050194144c7a51203d042e4e1cf" } ], - "ID": "f277ec41-8c8c-4d71-99bc-3972c6bd32d9" + "ID": "f6f0841f-5015-48a0-b6a6-30364030fdd8" }, { "CommandList": [ @@ -311,7 +315,7 @@ "ID": "ebac52583bc449c5a4388b99e7f43d75" } ], - "ID": "deb654cf-7f1c-414a-975d-778d91be778d" + "ID": "7a14d800-a86f-4dbc-a5e7-a0ce6c832e9d" } ] } @@ -600,7 +604,7 @@ } } ], - "ID": "ff866eb6-bf69-4699-9e05-8e4b28236115" + "ID": "7e35cd19-9161-4ff2-9319-c9a9945f9ff7" }, { "CommandList": [ @@ -613,7 +617,7 @@ } } ], - "ID": "aa79e416-8945-4fe7-861c-4cecf87073e9" + "ID": "7433ec1e-4946-48d3-acc3-ed55140ab00b" } ] } @@ -725,7 +729,26 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR('任务-侧栏'!项目经理='任务-侧栏'!当前用户,'任务-侧栏'!父任务负责人='任务-侧栏'!当前用户,'任务-侧栏'!执行者='任务-侧栏'!当前用户)" + }, + "GUID": "ab8e1569-c331-4349-bcaa-8a2610c13f2b", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -741,4 +764,4 @@ "Formula": "'任务-侧栏'!$B$9" } ] -}//Fhpxne7d+jB3qYpukeoqK9blhmnq7iJeh+coKN81ZqJgvksgxbDZilWZovXbUAWy2isiwy+e5VhyvcIi2b87AVna8Puh0uGsPulpyuFCiGRiQArLFOebEWfPVx2HwRvDqCGPIqiNJn9aylwubh3zBDFWIaV+eYEWmXTal3yKoEmcTqtfLA77z7waNuW5KxUyRj6aZVq0D9z+ujIi6WDvlCuLoGlItj/lcQb+VEyfBODacSTdpKirIi4JxM/malQ/e+Qv38FlAQF8Ii9eALETMttGadrYjBJQs+RpvKCzFaOzwjQcGObVkGsNssa1En1Y6rn9oBuovxnFBnoIqxyCsevKeEAQbO+qW4HRrSpsZxbwtNLMIiOOyCgvkYpRJcLjI/43Maf0Pvu3sntYqgvvDA85YibF61Zm7uLjveA7gyXjqduycef7E+l+PCzO1Od8jciPRf50UDUz5qYz4+ldBYHkRFyMV1uTlPrp0v5x953REaCD0EpCTMWPd7vX13O53R1Fv5TPDLVZfGH0cUPUu7tqJIUvD8SnjnH4QlKZov7yjnjpQQuLyPKAdDybluabCY7tvjrB1eS0LctM/wDLa7wW+m7wmFh8/itzED8whUNty+RomrkOSytNeHiOOElBW++Msmtu/KSEc4QjEP1T/DJz9VznGzmsA2LytlyFwc/GWsjeEJXQPF29RAt1pfMSof/y+6aLwK0nWYSFFb8bOR4PUz+vm5QMSLkfMzyNb/HZEcT2tqvdB5ZNpMZLCaO027t1TZ60/30KYKVJaq8bfJtCDMgfHegbJloh8W8owZUJNRAxGgq7yRblkzXhA1UyIYwUm12elCaPgMo6PBfeuHMWt+Ip2EO5M//DW5FfcycxGnHHKBuCWITdvihfBG1uD0gJ6T5YTHOJqo0FIN+cMg==|920 \ No newline at end of file +}//v5uTA7K7cFshVRQfty2XdcCooLuAJNGnDF+csV9/1P44ekZLWQZsQR6u/weaHSbizywC/lhlkv38eLkxsRrUc+NTOP0yT3lXpdkPJr2yd0vY5xe/rTZgFGjBrlZwV1je4+yOSYF2fQALL3XqUw/jm5g1YBg0MSTkfw4owxxmV6lyKOBI+UrdK4G749ofADawt0iNjL0sZGba6MVQFoyzae13xeAZPJbIGFBj7Z6KVtKSKvV0XnfLGxIzL8AVO3BuVL9gEcZFXue/NHWzo+EhJrvK408JWcY7cIB8jMeYR/CnNAYRzNOXNI1oQ+SmlohUSyvm4/hOgsw5X6yGuH0qUNtIRRshQtEN3hJLr7O97mei/xKOZqmwZG7ko5MixbVcAVWYJAyT4mfVGFLKRSb1Yw7UqLUd+y3w4bnEx4hY23RITYDF2Kqj8Ecb7BHipyZrbEy4XDnGdtYpJ2lXBWYqYK1PoCcEHvn5B6pmZN17yIi3X38Nyj4jwvCT5XHFGxJ/sGoocnBGEINhnjF829jJzRdy47mTaZDGVrkgnj0DzXKlaf5qShv6yW2zK7ffS1OzvgIH29SNzChFNTNqmvJm3x28uhDS287rg4/zBmki3UXI/CkXtM/7DOcvJxbACdGwTARAtgwEzoe80D0v9bc5PuJE1Ea3O3vGAWxjJKWleE7reLoWZai6A/vcesrpdqjakEgZ37VlRe8JokBxqjbcYP4/43Y+XQNwXTYJpt9ulzCBPD4eApJfilQdktIz87lceKCoYuXVb1vEjDKtvRC/WbdmiP/2Tv8LC+IcqFP3FOponJokXneMyYun/k6icxcE7ertlSMVxIclL+z6iQminyRGDvoEotiLRq55UCYkJz/XYBKCDYSM1utlqjBWQB+0iLRxLLJpnHsnnDoQvDvXWw==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index eac45a71..906f97de 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -414,7 +414,7 @@ { "Value": "个人日报", "Text": "个人日报", - "IconPath": "", + "IconPath": "日报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, @@ -449,7 +449,7 @@ { "Value": "团队日报", "Text": "团队日报", - "IconPath": "人才.svg", + "IconPath": "日报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, @@ -498,7 +498,7 @@ { "Value": "项目日报", "Text": "项目日报", - "IconPath": "项目2.svg", + "IconPath": "日报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, @@ -592,7 +592,7 @@ } } ], - "ID": "6495ba87-21d4-4988-9531-614cf3222b02" + "ID": "299cb942-a31d-4f57-9732-19eeb74b92bb" } ] } @@ -612,12 +612,11 @@ { "Value": "个人周报", "Text": "个人周报", - "IconPath": "", + "IconPath": "周报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -647,12 +646,11 @@ { "Value": "团队周报", "Text": "团队周报", - "IconPath": "人才.svg", + "IconPath": "周报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -696,12 +694,11 @@ { "Value": "项目周报", "Text": "项目周报", - "IconPath": "项目2.svg", + "IconPath": "周报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -790,7 +787,7 @@ } } ], - "ID": "980c01af-bc0f-4a2f-bb48-cf2028979f73" + "ID": "5b8dbbb9-edfb-4f26-9342-3cad2edb2106" } ] } @@ -810,12 +807,11 @@ { "Value": "个人月报", "Text": "个人月报", - "IconPath": "", + "IconPath": "月报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -845,12 +841,11 @@ { "Value": "团队月报", "Text": "团队月报", - "IconPath": "人才.svg", + "IconPath": "月报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -894,12 +889,11 @@ { "Value": "项目月报", "Text": "项目月报", - "IconPath": "项目2.svg", + "IconPath": "月报.svg", "IsBuiltInIconPath": false, "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, - "IconColor": "Accent 1", - "IconColorUseItemColor": true, + "IconColor": null, "IsOldMenuPath": false, "CommandList": [ { @@ -1742,4 +1736,4 @@ "Formula": "汇报管理!$R$6" } ] -}//dzS4too4E4Le/EtH6U/m2Uz8lyQ91nEE6KFSFSmy1JjN7ccOi/TyH6W/iypfQ8K8WGhMNZcOcRiWzxHznb2Vs9oBudxuDHZzZW5h3kiARGnlsBy0jRq8FUrUg0s1aVWxK6rRjpDxtffBjntp+9rZrDGCNHXoXji92PJHA10tBRygvB9649/7S5Pndz6CMjOLD1XCnwphHo29U5eUXvfNdTGifoqSt63At94PS4aaZNKDCV/MHVC1bBScfp/kpPqNk4Y9ALWubdpOvGEVDKXP6nREFgke14+hCDb1CBHIS1iBpbm2hw5iV1P/nKb8bFnJtIcSa+3awwUJtZ2tVmlasdI/IO1CgT6X/EoQk2pe2nepeV/hrnFTFTc8ZVDIDcAlmw4jn5U8mRV7jOQ3FED/qsPP+YUqVkyYAK8WQ5hEl5zGzFIYcJHXmb2dFdrDSLYT7YsWc/OsbIwxVYVwNL73FQeOsnApX5Cx5nPG4YR2JpqsvbTk2qMsfJAKYPhle0CQfFJagjnLZZ58Nv1FWu0NbqZFDIoooakaeeH7u2dkqf6I533+PbgV8ULnR/pW3BicZESO/+DD7rNPl45HKGW+my1TD0EUQj8EjA5kb8/EHKv2xezG2dOkyA7Ic/108bLv02cD2sE63CmEF7mRUagABnirfXGaPR+dpKyaymI3n2ZUVykK7Mf6L/JdXvShFmkpcdkgfcKAj1Ocj+5aWJG92+QIsB3H5s5q/Kth042UiVmfEhPPfSfxFrLZDjYIA3TuHhZUYvYdzJjhgdvfBDsYvCwq9TM17DV/d9T86O4iKrKGuOIQbBdptB834oaiTSuHxcWYtW/M8OzTWRkqpEdCkt/iDwtHXi9pq+pFecR6V7/wpmzmxiGSO7uWbp2h/MjdHLU9BBEgj8+lJXAk5CCCTA==|920 \ No newline at end of file +}//ufIMV+CNru1WWTf/yK02wWb6KA9YdXcmJta2VDYJt5WpUFwwPozsCZk2DaMRGJlC2aMvfHuDu0gyoAoV5WdhCT5mupwEdBwzuGQGhbu0VOK4DpvXLg9AbXlgZknK1u93lkLNfEvFU+PVKMcmgKHt6EkRjOgAiV4Ny8XUfzenVxYCzxr2T/CakR1oPu+kikM4wGMPhWdSMo26nY4PdkJSn00xSJlngt3RU/X2s7ui0KqzxPi41Hdc7KaY+0PTqo+Y4gU6igMKTsmRkI6m0r+hRMB/t+oE5YdYullPVuOA6z1sn8WskV4/F6eMonmlQKvmFt6CSUHCyGfaCP/yCxk7NHVt5wEQwdCwNj5DxNv37Y27hPULHHtQea4g4dORBgAS9AcD9njQMvPvXfksRddCHCtOLnJMFYtvEDC4vD+Ppjq0ZNdRzdz2Msq/Q4qcIVnYbeV5zgsTEXzHZbAk+oLf+bxFGKsh4AVGHnm66Nn9uWuWGYZNy5G0RVk0KefrT2I9yBGcVeUVOQ+wWThm+QXNf2SLvoZsURTCkZVu9Z3EBFTH8c2OxZb6lgrg2jz9tRQtt6tfNfaI5YUBS56+D8fDUq3yS84aVktpLWPyyd9wpqk+t2M7XfmivAnF75k7YgX9LrytB8Y85CHy6+S6W9zSDy6j4N2RQD7fhDZ+F+1iy7BddokjiIK7OBC/3CWLPjbW/+yoUB+4grQ6k1lHHU6flKQHLDSTOek793ztq8CT9xzQpOYgt5qQ2YwPZl0ha/e2Y9b5rsaSHsoxgxNKuzg4uUKLCe7as6EOk8cA4RQ7RkVLXeliUre2v0KHhg2ImyCJuGkdJKCpf4L3wZWdDFMjCrTy5IY4rQbDGuvKft8Jb3d+pOgFxTFdbfHkh7ceh4L6w2+B3WMHdz/UrqWEsJEdPQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 62736e84..5941ff0c 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -194,7 +194,8 @@ }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 300.0 + "DesignLengthInPixel": 300.0, + "IsHidden": true } }, "34": { @@ -279,6 +280,10 @@ { "ActionTitle": "拒绝", "TemplateKey": "拒绝" + }, + { + "ActionTitle": "结束", + "TemplateKey": "拒绝" } ] } @@ -781,6 +786,100 @@ } ] } + }, + "14,10": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "流程实例ID", + "GUID": "a7b5a534-19a5-4665-8564-27355aea2a66" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=处理反馈工单!K15" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "bb1f9d9a-aa3f-4736-a6dc-d5aa3bf6cdac" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!K15" + } + } + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_TASKINST_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "b61572c9-2627-42c6-bea1-1ab466ebcde7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!K15" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_TASKINST_View", + "ColumnName": "ASSIGNEE_", + "GUID": "c0b79ed2-6f19-4b9a-99ea-ba35a7f297c0" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!B2" + }, + "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "Refresh" + } + ], + "ID": "1e70ff64-8cef-4f28-a48f-4c36ed5c3a0a" + } + ] + } + ] + } } }, "StyleDatas": { @@ -822,6 +921,9 @@ "FontSize": 14.666666666666666, "Formatter": 5 }, + { + "Formatter": 6 + }, { "FontSize": 13.333333333333332 } @@ -833,7 +935,8 @@ "[AUTO]General", "black", "Left", - "yyyy/m/d h:mm" + "yyyy/m/d h:mm", + "@" ] }, "CellStyles": { @@ -1033,19 +1136,20 @@ "10,32": 6, "10,34": 2, "14,4": 0, - "14,5": 0 + "14,5": 0, + "14,10": 9 }, "RowStyles": { - "5": 9, - "6": 9, - "7": 9, - "8": 9, - "9": 9, - "10": 9, - "11": 9, - "12": 9, - "13": 9, - "14": 9 + "5": 10, + "6": 10, + "7": 10, + "8": 10, + "9": 10, + "10": 10, + "11": 10, + "12": 10, + "13": 10, + "14": 10 }, "SheetStyle": { "FontFamily": 0 @@ -1068,7 +1172,8 @@ "7,25,1,7", "1,1,1,16", "0,33,14,1", - "14,6,1,3" + "14,6,1,3", + "14,10,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1100,4 +1205,4 @@ "Formula": "处理反馈工单!$B$15" } ] -}//P+1IwdnEHe6ZXXP0br1PjgGvrZJ7LZMor652b6CeG8jSEq6TaCdaomTDDd9tNjIoYHvPPn40cCH2prhwur3CU0FcHAfxblQZ2Bo3fK4ubuDGz3+EDFAsLMRNncuKZp+cfZ4oZtQC+tnFNsptpjoF+kYG0HtLjUPsPd+eozrtZpAzs1bZ9B1bXWZXu05GpWQMxYvWHN57tL/SNgnStJwda7UTCbXfqwynmb3AGbPuh6nwY8VLskMTuFF6FGDm06VlrMK0oHU69ZHSV5GPPuwfnh0UxW8h4G/JVldU3g2mW7ExssGp9rjTkMCXsFL40gxIYCqRReCbtKnC/xbjP5U2XKryqglyede+lyb9Tv8DrwygvE2xDWh2+znrUQXAtHqGSYPhxX6rQkNQalEED8OT+OoNOcWxcyCOom152gntFP2+CyPN10yVa5kkM5iF7mFj4jc6++hrE1mEUKlYJGOz1NdnqV4jv3SIhggpRuBWN9xjbFsJtutQNK40TjNNRLEUgOrVasO5yM//RVvL37mGr6YxsnL31Z+Td5inttfR+XzWzNrnxUmEI3BmJTeXo7Ty+nM3Ppbc2o4Ojd3pj4NmTx2e71YqLwzK73xINn5Hun+JRFOPlQvqxRc8yugnBj7RVUW7YvE90nxe7kBkfonnhYQobdrFGrzpbn2tksP7HxjSjKyyJkovNMbQcUCZwdhMo43JfEmE0W3WP6jmOeWGRp26qFEKmk3Nb+WHkQ0qub5w81voiTlpz0fA5DqhQGaNn+X8B+aPbK1BgPe2zm5tSoQlB+TybqglNXMtePl5dnVtr8xE68WFeWOBuynLzhZuLQ65OT/B8pBnOSUE1zxsv87R/zT96Ss++SbCXGcV4lZf4XDEkV6EZwId0whNnBOwBAjYZROuvMujeQUafpok2w==|920 \ No newline at end of file +}//aIn8bfzFeSPK+bUCj5BlvRUi/BS+yd2kx0fuc1/Z7sC4bsZ80PUAz+XxoVNLYtr025sCEHHCKG/DV5+askQQfmnbg/AMEWM8fWjVebotUWpb9YxPRC77aDRyM1H5y6XLKwp746GAVG9ubw1uD3jb9PonvjSuEi+Tln7tR3bWRATdZuTWh+39TN5xU7Wl3Qqr9O0DDgVNTeYemyDg89kjIQ48QxGlT9pu0oPhXeJVtOv95AJFchHZOEODer01e7VY/s1WHTo9F5PXVvzCDL44VaY5Jn9KaoiY3tj/PIqlwcpvnlNEMSVCKUlcGCU5/Paag9MsQCZ2axsfw++yUCD/NCRrQ1wjj98345LSXr/6muF6tQAk213GpzBKUJjsWlb5LUjIdJ9YXSbO6KC9XzQ+0xg2IhsMFVc1vELcIgU9muPDUF0ODj4FKUvwv5bu/rXtA1jqfUSg/vWsW3v6EaUBeJzTLzZCFVZs9jGoNuOVGrA+kXDsLWUSKP9NtHSw0gxwCKACOg0i9x7zKRbj3F5cONnBtvUAsJ5NUtIYnWMAstQKMMuCRTCjQLk3dqSVN8P/em87hxiqU+Jm3UYsAESK58e+gS0eS2SCwfhRGrkJju2tInKnq34aUK9uNS7TrqpNrAy/uD/wY5tOCXRqVdzjUf02dMu33e63TjI0R2fg3+t5zwwl2RdtnRFiUaMn7Z8EtIXZPQatKdQedpa6PIe2Js3E7hJJIZGb7bZAq4nHlQynJ7OIZ20/qEz1QItgL4pxt6gI6sDxjerKwVDkwxrjBNhP+Oatj7WTFHM8Ozv8AO1ho/4tMQsFvgokl3CsRV9R/8uM8YZoqb56kgBfDsPbSVlNjMv8txG8IKq+uhBnMC8+sI0bf4GB5zlYlyU7C/CjXtFOuClGMrV/n+6ZGlPi5w==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/工单进度查询.json b/Pages/项目/项目反馈/工单进度查询.json index ce9f4a48..09e3a37c 100644 --- a/Pages/项目/项目反馈/工单进度查询.json +++ b/Pages/项目/项目反馈/工单进度查询.json @@ -471,7 +471,7 @@ "ID": "8b87ed0054204ed3996a288dad0ddc28" } ], - "ID": "964ce538-ed32-4e03-83c0-7244f6478a9b" + "ID": "39d0fda8-0dfa-4f82-9776-f980a9c35960" }, { "CommandList": [ @@ -509,7 +509,7 @@ "OutParamaterName": "查询历史字符串" } ], - "ID": "0ce2173e-64e7-4b80-8231-5cb55c8575b2" + "ID": "bbe7d261-97f2-4e6f-80c2-489af987b20a" } ] }, @@ -538,12 +538,12 @@ ] } ], - "ID": "f3744069-8911-44bf-a677-8b46db45e6a1" + "ID": "325e97e3-6cd7-485f-8179-0ca3b1f8e2ee" } ] } ], - "ID": "1bf7a29e-373e-476f-8773-ee3f936c2171" + "ID": "6f7c5d25-e735-4cd9-90c6-5202592defb1" }, { "CommandList": [ @@ -587,7 +587,7 @@ "Message": "无该工单记录" } ], - "ID": "2b575d25-4649-4e4d-a337-b91d07b49ae3" + "ID": "bb1893b2-a503-4be3-835a-8934d345dfcf" } ] } @@ -1420,7 +1420,7 @@ ] } ], - "ID": "88bf2e67-3496-4a37-b3cc-a363193ac57d" + "ID": "eae1df9e-7479-4852-88bc-5aeb54393163" } ] } @@ -1476,4 +1476,4 @@ "Formula": "工单进度查询!$K$14" } ] -}//VVeuFxrH8b8gpwWdcn+1MqbzSszNDRpCblcyNCaeJM4zR9HnMDmUobomWb8PpDFYbukMxb265aptuZdeHcNPflirWkRlLpDIu8nPViDytXFRGWhiJL9iChe7cYE5CLwLHdMN27gU4Qx/6uekVPVbbYF+BgxNOmOitdwNxTbZHHUvwWNmVTLmfGVEaRlLLx0lypb2CC1pRHtX1x24Q7aA6H5K1zLzUOWxRVlH2jFdjsCqBwN1Mporcg8OWjwujGgz6N3aqUgfx3HRjSjVwaRUok0ZBa5XZ9dvRhZ0g2p1dOQ9n2aXB9FAu3nYIR+Pe2bSzj7jILkd5ECIDxuOHwmsPzLBhd3GC2EeaSD4PBv1SdGjQoa+Z74cVLdxfaRvIVgMOIDJ1LKWxJKgFfOQo9g0gFpaTXnuELyipiR2etS4WhVyP4JzOh26oyt0PfVVYwLVkTX4TTYpisHTHtGJOHpnwnLUk3mkVElXdUowvDoqq0z+OtTJDPCosps1QSE9Lce2L05ogUIPUKLwdGbP3jej0MoZNNJKvC9PLzOEMG23vy/jiRD+N0CeD3X6Cd+nqotfd/syBAJJ0cXjDBrEqPl160CVDDN+Td9t+9pAbTH3GFONtxau5QTRQmNTCtfSll7O0j8iNX/uF/fS9VCI2h5R9R5PTsBiQPExz5G6zqfWI9nhEHkifA95RvGcL7pYs0HbHrf5Izk7/sPwOGHnAWUwjjLXLfEE1+e6XXbPkdEc9mJpMu63dvGyf/ZIzvdRGyWBsMwwireA0BBoezqoqzJ2tenf1r72HlfTcDTTV/LXe2F4QG6jntAyjA9P6phCB6OVEFafjT+1NyO8FKDpq2Cn+MeSlXcoF5RWJ2fHmpwM6jNK2Ixn6DXeNTRMzH2M/Fg6XTs5oYaZNXrBA2hsdZTdgg==|920 \ No newline at end of file +}//1Xgtd0z4t2nXSY8p45o+fdOWceAS6wbFbG7g0Q3Ot6cMXZFPtHG8PCgyr566yInN7p5H1Pti83PXGOPu8h5fnTvuoAuknKAXTELt4mQlInJ4aPc1DVM7Cb1VrCzG0JoHCn5V9AJuZ+LzFFjggXmL665V5g/6vse4BdqUhAU1I3t4bBJX37zpb6GU3xY+du15Nwh8JN90p1ZZF/3OuKv8QVoUiTJVuOQruefKY3d/wZdpqcha+QNBSJaazYn/JVFQSv4PlqmaSS/qvFU2WpAywHaOh6pkZl/vLlq279hq7ZB66VlfXitKc0HdpltxHhwMAJWB/AS7szimCw6WEQEJmjLUGDbQ+muv7acfRgnkWyRHemfxBVlAeoT7jLQtErH4p3J4vCNpTEu1+kKCuI2wJnWAwiRU3Z6uqUANC+tKhMp0OP+abeK7t/BmrvY+m61XowmrJjEDk6ls+bHfhOsjAbGD0k88cJFLBHVEIF8BywMUvw1iCHM6EELwd4UraU7ZtKS6xSb9b033RX+mn4eQ+ynRwGYJddK8iSogiDYaP5sUwnIzHVG5u6jJIqZ3U3vig/7Um4EhnU6nmeR9L96UQzE9N993uAaiHN9SmTp6XJ3hN2ryVeTRyy2rXNbvXIOGN8sn8wYYoBiIqqaqjNt/vWM2guV+LShxOG97AMJnq3ncukNHSQHHHLhdOR/3acg20KWb3ZpVZ0BHwmcpSpuNUXsjjUxZYnzFw6t4ZTznuSXKaSHFDvQXYDIimtXB9jZKILjltUN481QrTRPktVhy/QfeHVh2NCQH5IOuaayHSn4h2wDB3jVW/kM8eodzCPuyAYiFWaealR5qsfZLe29RPvqmVzT9cnmAvj0/+uAnpwXSFLHnKHGCaZvc6eVg+slHvHxWXGCe7pyaGFqj07u1Mg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 415a5860..83fb2233 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -238,7 +238,14 @@ }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 2.0 + } } }, "35": { @@ -657,15 +664,6 @@ }, "ColumnName": "ID" }, - { - "GUID": "ca503df1-f866-4fbb-a73c-1bd03fd04968", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "标题", - "GUID": "68538bf1-a717-41cc-a33c-438aa2932028" - }, - "ColumnName": "标题" - }, { "GUID": "3e4ed1a7-de3a-4ae8-8b6d-d0011a1dc472", "BindingInfo": { @@ -680,6 +678,15 @@ }, "ColumnName": "反馈类型" }, + { + "GUID": "ca503df1-f866-4fbb-a73c-1bd03fd04968", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "标题", + "GUID": "68538bf1-a717-41cc-a33c-438aa2932028" + }, + "ColumnName": "标题" + }, { "GUID": "2f13d281-7418-4d4e-9dab-0ff5f44efa1a", "BindingInfo": { @@ -907,7 +914,7 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "ID", "label": "ID", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", @@ -928,15 +935,18 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "任务名称", - "label": "任务名称", - "align": "left", + "dataColumnName": "反馈类型", + "sortable": true, + "label": "反馈类型", + "width": 150, + "align": "center", "headerAlign": "center", "colfixed": "false", - "type": "Default", - "tagType": "info", + "type": "Tag", + "tagType": "primary", "imgType": "cover", - "key": "3485b7ca-27a5-4c2d-808e-f09fd59fc171", + "showOverflowTooltip": false, + "key": "f7cdd87d-92a1-431c-a81b-53d15fd9ca65", "UIPermissions": [ { "Scope": 1, @@ -948,17 +958,16 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "反馈类型", - "sortable": true, - "label": "反馈类型", - "width": 120, - "align": "left", + "dataColumnName": "任务名称", + "label": "任务名称", + "align": "center", "headerAlign": "center", "colfixed": "false", - "type": "Tag", - "tagType": "primary", + "type": "Default", + "tagType": "info", "imgType": "cover", - "key": "f7cdd87d-92a1-431c-a81b-53d15fd9ca65", + "showOverflowTooltip": false, + "key": "3485b7ca-27a5-4c2d-808e-f09fd59fc171", "UIPermissions": [ { "Scope": 1, @@ -972,12 +981,13 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "功能", "label": "功能", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "9f1456b4-ee8e-4d42-a846-d702bbb1ead9", "UIPermissions": [ { @@ -993,12 +1003,13 @@ "dataColumnName": "提交人", "label": "提交人", "width": 150, - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "ba76d95f-d958-4c3b-a546-f297806c7c73", "UIPermissions": [ { @@ -1014,12 +1025,13 @@ "dataColumnName": "处理人", "label": "处理人", "width": 150, - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "ccb117cb-c757-4e3e-b891-52780819141f", "UIPermissions": [ { @@ -1035,13 +1047,15 @@ "dataColumnName": "处理用时", "sortable": true, "label": "处理用时", + "formatStr": "0\"小时\"", "width": 150, - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "dc989dc1-d92b-4aa5-a4af-3cbbf2269337", "UIPermissions": [ { @@ -1058,7 +1072,7 @@ "sortable": true, "label": "状态", "width": 150, - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Tag", @@ -1094,7 +1108,7 @@ } ], "type": "button", - "Name": "处理", + "Name": "查看", "styleType": "Accent 1 0", "shape": "default", "Commands": { @@ -1117,6 +1131,8 @@ }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, "PageName": "处理反馈工单", "LoadBindingDataOption": 1 } @@ -1275,4 +1291,4 @@ "PaperSize": {}, "Margin": {} } -}//likJV0bMTzJsaLbECd2XFsPkwBd+vLBPYXxexWHj3qvKNSDf1N7T9bVjs7HdNiFf8DYJlLyMYoXOZxATBZghM2/GmJ5EJ1A1pcnpo/mCBwndpaKXxrx4q7hmKuocyqVAqZRu972iRjuIxRrXzKEsJlyYBP+xsbxZwsDto6CV8tqaVSDcesddRs4lts+FAd0PTWtKdm9UiVZzQ1826d/5dtynXxFp8STMXq4u+L/iDCVQ+FNynLYjokFcoeaoNP1R2qe34qkIrzsJ5SI1eWuynhIuhxiLro1ZsMPM5UdAW5TVwtoGYDzmEIiK5QWrhdvxnMpdoACN48w3/bMJgUkR4pz2mNRaCXd5Crmixspxu4s1gzocEDfKCl6HHGdY8qV05H/pdnW0lQCwS2V2m7rZdb0Y/HcwGSBmcDnIkJV3KW5KjL27UUxDaVM35y5zBBvcJWHfq6MziDw2ZCtQrr2OCjKy1rT7pFcpUxWOkl+IBZYRbf7aIw88PrIWnvxreg68MUU6aQBNchDdwnv7zWJwdDPYx6YH7mWtuRj1yc8JNWLLDZ7Qb7UemAGlUO61IhoVFKw/QrPZ58n1UKM6uPtbiiYoq/ohXTnRNYdDRJAVcoJ1F0RnwD4DoaODO+AZd5McAjTzrTW7Fo2sMYc3/hUJL10Dbu+2mPsjojgdcCilXE3qJYVX/gaPtnvnfDol7Z+lY4S4LMF6na26UoqVkL8MZskdqpyof0/IrBaDEIpXqgoa4THBStnYvcRomRZBBJf1S6bMze3vDJxV9cmXkYkhyXjOfWxSlMVzIgH7Br35GD/hXZnMcZNehgAV2zwILIbCF5ej9YTXOMvHkYUYXFb+fItKb1n3BhpQxucQJFLg/c16kKbf0q1oLVYeGXL4MrYgxSflCCoMBNyarlZdyPq16A==|920 \ No newline at end of file +}//bYLhGhnKXsBaXzOUVoq2DjTYzRVPZt1XjTjOxte85i2w8hVACRG4kDk2yP4/PP1JXykSA2ILMfqFo5OoOUt6z12EvHxmaU1UuGYLrJBpyrW1Q23neaA27KlKhONtngJBnFdNpQ5aHq+XQ7J+oPU1dKYBjtCFlnzSfJDSEae3buuxpJBnG95K4/qnGuxEAOhKtL4CYtafqEwduXv3uCL9E1DoB5FqTND7xko8QsmBMBN4ZmUrVrLPiJisPSBSNGVcS/1GD6IkuzNNfMQK1sP0CWg57yk30WxyEbUHwRFRWtWbXIdfbLfbL2Glm1L4ZNqFStYHbvV5xX3CXXERgVxLGY83cP/iLSxplD1TikuQJRmXhOS7fi77GcSohJuDC3NzQYlArLrCXKyh2yr+lPZfKe/zz7MF9DCYke0atmOMqHhEsoFD7i6nHpdUo5BkpOtqrztXqLrcDtwLRsCqeR+GHXkmCH4HOVYWy0nUG/MQ9lc30OUIhz58xpyK6sr5qrxNcKHwHwkA7Kf1TRo0p80Lq1oAbEOlHEi8WlFLBF9gCusXZJzuaX7SDGGLYl48g0mV6BavOKCqQv+8hdvvyxFYt8Ji1WtodS0f7X1KnKed73sDsNOnKq/kcxHLF6ItroTtlrtZlID7xSOBilYErm82syrOxcJ9mlRqxolWCxUpHWCPFi6QDSZWyL6SPZZXHhTRjdhVtm0gFEEjIQI3dTkxtlNRgnOe+X5JvDtvI7+Jrea0506IIt4I61m+5Of462dDjF4s03qcq6epbS6LU2qZ4+rSOCvZkjSBfdJDTKJS+1x9pDdzVhfdlRHv23MvtqK/T4ZScuv5NcxQ3AhQFvEmGPjabPk+iQbbmBhRy2bnsrA8vEhF9yusmr9dFRDx0AsN7+OtC7kJKf6iboA13mXsqw==|920 \ No newline at end of file diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn index 0e88bd08..15106c2b 100644 --- a/Process/反馈处理流程.bpmn +++ b/Process/反馈处理流程.bpmn @@ -4,7 +4,7 @@ 处理用户提交的需求反馈 - + @@ -35,7 +35,7 @@ - + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 Flow_0e920z7 @@ -55,7 +55,7 @@ - + Flow_0e920z7 Flow_13qnftb @@ -79,36 +79,36 @@ - - - - - - - - - - + + + + - - + + + + + + + + - - + + diff --git a/ServerCommands/任务/添加任务成员.json b/ServerCommands/任务/添加任务成员.json index b0228bda..f4609bca 100644 --- a/ServerCommands/任务/添加任务成员.json +++ b/ServerCommands/任务/添加任务成员.json @@ -45,7 +45,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "47e92c41-58f4-4a71-83af-2427165737fd", + "GUID": "e4943954-7435-49c8-a502-ad73c96b6223", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -54,7 +54,7 @@ "ColumnName": "项目ID" }, { - "GUID": "5dffa8d6-6568-407c-88ba-59fad29962df", + "GUID": "22eb4e11-f5e2-40b3-9230-1bc029f832f5", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -78,7 +78,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c5ff723d4e8f4be4801dc0135a434afd" + "ID": "e72448b4ffa2460a97c89ac6805f4cc0" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -88,7 +88,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "4a28ca68-9d89-4951-8303-13e68b83ed63", + "GUID": "f0106c58-c558-4498-9a60-b79d21c0376d", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -112,7 +112,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c488aa6c7d1048c5a8e688e8794992aa" + "ID": "aac7cee2035a463eb7dd7563fe2be4bd" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -161,8 +161,8 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { "TableName": "任务成员表", - "ColumnName": "ID", - "GUID": "286f4312-5d25-489c-a22f-fc629037d3bf" + "ColumnName": "任务ID", + "GUID": "1a1f5104-7859-40d2-87f5-a2186e3e52ee" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -185,7 +185,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "c0ad8d38baf740c68763777ca53c5cf5" + "ID": "2b1a963daa5a49dcaaa0873a16a34b5c" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -216,7 +216,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "项目ID", - "GUID": "e118ef57-0a38-4af1-b96b-2d0e05f97b71" + "GUID": "01980cf4-cd0a-48cd-bc32-ef60b7eab7ab" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -227,7 +227,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "e74fbd35-0dbb-4d36-a7ad-4b893539ba4a" + "GUID": "5e12b37a-d9e7-45c0-9e00-1dd490329ed3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -238,7 +238,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务成员", - "GUID": "3ecd6178-ccb6-4618-9206-1e0cc1c9f414" + "GUID": "f0e12ca7-5752-4271-95a8-2aa7f1b2c3e0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -293,7 +293,7 @@ "Message": "新增成功" } ], - "ID": "ecd27f40-6675-4b97-91ec-61841ee0156a" + "ID": "28a7ef4a-d59b-4742-b11e-dec14257cf34" }, { "CommandList": [ @@ -303,12 +303,12 @@ "Message": "新增成功" } ], - "ID": "a313671f-b7e7-4ac0-b8ae-7e05be939f8d" + "ID": "c5a215be-b9f8-4ea4-aa8b-590c10adec58" } ] } ], - "ID": "2f4f4fa0-901b-4248-b601-1d5c4083378e" + "ID": "c954f3ec-601b-400e-bd54-6604c2db48e1" }, { "CommandList": [ @@ -318,12 +318,12 @@ "Message": "成员不存在" } ], - "ID": "f3674c09-cd06-488e-836f-3e1d566da70e" + "ID": "41033874-4b24-4712-8c36-bf2e793aa7ad" } ] } ], - "ID": "017a4259-fef2-40f9-a315-af8590ffeb61" + "ID": "4e67b60b-87c3-4776-bae6-c5bb53245a7f" }, { "CommandList": [ @@ -333,7 +333,7 @@ "Message": "任务不存在" } ], - "ID": "475e3810-3875-433f-afdf-9c2cf85f5fa7" + "ID": "e44cc381-59a9-43f2-8a8a-02b00eb4038f" } ] } diff --git a/ServerCommands/项目反馈/后端新增项目反馈.json b/ServerCommands/项目反馈/后端新增项目反馈.json index 984c4ea2..90f820a8 100644 --- a/ServerCommands/项目反馈/后端新增项目反馈.json +++ b/ServerCommands/项目反馈/后端新增项目反馈.json @@ -55,7 +55,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "b370116d-4f63-4cbb-80c2-68f245dc28d9", + "GUID": "8df9b983-2ce9-4dc2-922a-f679e38bf456", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -64,7 +64,7 @@ "ColumnName": "项目名称" }, { - "GUID": "5a7beaa3-e1ee-44eb-98ba-1a92be5bb564", + "GUID": "3beb936c-5a81-4e85-9165-f3158a094755", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -73,7 +73,7 @@ "ColumnName": "项目状态" }, { - "GUID": "b5a271f8-50ce-45fc-ad57-8eb7873e61c0", + "GUID": "c729914e-cb52-44c4-8595-bf88e8d87859", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -82,7 +82,7 @@ "ColumnName": "项目经理" }, { - "GUID": "f91312ec-3f3b-4547-80ac-c3edfd20f5e6", + "GUID": "0f0551a1-7e0d-440e-aa95-31e52c6c696b", "BindingInfo": { "TableName": "项目表", "ColumnName": "开启反馈收集", @@ -106,7 +106,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c90a96772daa49ae990d6f5df8c8454a" + "ID": "d4ef55e776e9446c95834eccd85916b4" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -116,7 +116,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "ee4fd145-3619-4a45-abb8-085d29f204ad", + "GUID": "f05cbe68-992d-4cb2-b9b4-0b97cbeef8e5", "BindingInfo": { "TableName": "反馈类型表", "ColumnName": "反馈类型", @@ -140,13 +140,92 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "7da56294e32d4f16b05b08a9d20f6318" + "ID": "474dc903edf4427983dc0c4f92c0c332" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "6f34c98eb09144edb73056dc0015ee3d" + "ID": "5841edd70613491daaa8f5e02731f9ba" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "de97885b-14f6-406f-937b-97b79bd12768", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "1c45b42c-aba6-44c7-ba53-0aaeedf6a9f6" + }, + "ColumnName": "任务名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "e4ac11fa-f908-499d-8b80-fac491d9bd25" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=关联任务" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "d7bef5f0274f4a349218203ef1a2dc7c" + }, + { + "$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": "=任务.任务名称" + }, + "ID": "412896d3dfd84eb99ee27643e7072235" + } + ], + "ID": "defb695d-d19d-4c29-b0e9-73b40cf68fdc" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "获取任务描述", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=功能" + }, + "ID": "5d68cbd5ae5d4d22ab061cf3659420f9" + } + ], + "ID": "0e761f61-8a31-4466-9a33-d4b506d528e7" + } + ] }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -224,7 +303,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "7716338b-c085-4f5d-b44e-a49ffc1caaec", + "GUID": "8d9b41cf-2e2f-405b-aa8d-2f0ff4767ce9", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", @@ -247,7 +326,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "85f142d6c38a4037b771e2bc84d9bc7c" + "ID": "6b1db8e1bcf94f3bb92538b031528faa" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -256,10 +335,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务.执行者" }, - "ID": "92a3f08e5507416982e91ccbddaf0b4f" + "ID": "1b3ebac6a8cb4ec095b12bf8e5c4115e" } ], - "ID": "8232b7c1-1928-4689-a242-5f7c21a84f6a" + "ID": "ddb42e26-8969-4702-a6a4-65e94c319314" }, { "CommandList": [ @@ -273,7 +352,7 @@ "ID": "06423efe302442ee9dbab0c23a871517" } ], - "ID": "9bacb66d-a3c6-4b21-95ba-5aecac840dfc" + "ID": "430b6829-9b6f-4f4c-a7e9-887a1904ffc4" } ] }, @@ -300,7 +379,7 @@ "ID": "4f2a2cbe59474a5889ba4e89ea6fe69f" } ], - "ID": "76c26608-218a-4a8f-871b-0212d15d8480" + "ID": "de3b5956-fe24-4d3a-9853-7019247eb4a6" } ] }, @@ -314,7 +393,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", - "GUID": "d757efb5-55c2-4da2-88e7-12fe614398d8" + "GUID": "4b0e5810-794e-47d7-af1f-d46167b725df" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -325,7 +404,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "标题", - "GUID": "44870432-8021-4e5d-b86d-79ee9ba0ebca" + "GUID": "65dc7a0b-e9a7-4614-badf-6c6b6845dfbf" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -336,7 +415,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "关联任务", - "GUID": "2bdecf91-fc2f-4a57-9c6b-42c3733f31e2" + "GUID": "204dd7ef-7640-40a1-85a3-15a9c072b94d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -347,7 +426,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", - "GUID": "16968dc8-dd0c-490a-b862-38071cb49ad1" + "GUID": "48e90a59-4660-4c24-a05a-699ddec465bb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -358,7 +437,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "功能", - "GUID": "cca4109b-6609-4416-87d4-9c0ffa440be6" + "GUID": "8ce66810-d524-4a14-aed0-137b5c725a77" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -369,7 +448,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", - "GUID": "2f513121-4f14-47c8-a233-a9d53df22c61" + "GUID": "921d5203-cf29-4ef0-87a8-7e93b36b0ecd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -380,7 +459,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "提交人", - "GUID": "1ad6dad9-e20a-49d8-a86b-d7f79e4bd6a1" + "GUID": "7e70ea7b-e675-46f1-bf27-6a825309e8d1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -391,7 +470,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "联系方式", - "GUID": "276750e4-a845-426b-a4e1-53f7f059c1b9" + "GUID": "b0588348-5809-4dfd-833d-691a51a1882b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -402,7 +481,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "处理人", - "GUID": "926dbf44-b7dd-478d-a47f-c34f85c777c2" + "GUID": "2c08cf16-8f5d-48a4-b6d2-bcd8d1be8333" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -413,7 +492,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "状态", - "GUID": "ecead1f7-f73f-4359-b34f-2f47031ad64d" + "GUID": "b4f0a058-9c6d-4b69-8b1b-8d3d141feb7b" }, "Value": "0" } @@ -425,7 +504,7 @@ "ProcessDefinitionResourceName": "反馈处理流程", "ProcessInstanceName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交人&\"提交的关于\"&功能&\"功能的反馈工单\"" + "SerializeProperty": "=提交人&\"提交的关于\"&获取任务描述&\"的\"&反馈类型表.反馈类型&\"工单\"" }, "SelectedTable": "需求反馈登记表", "RowsToUpdate": 1, @@ -462,7 +541,7 @@ ] } ], - "ID": "73a56968-4362-480b-895a-410e84581b56" + "ID": "a71b3cfd-1dba-47b4-a2e6-f239b6f0a4e6" }, { "CommandList": [ @@ -477,7 +556,7 @@ ] } ], - "ID": "c32a5ee8-827e-49f0-94da-11c30588ed38" + "ID": "1dedef6f-6b9a-492b-905f-4152c9aa2f7a" } ] } diff --git a/Tables/流程表文件夹/审批历史简约视图.json b/Tables/流程表文件夹/审批历史简约视图.json index 366b2257..782f6280 100644 --- a/Tables/流程表文件夹/审批历史简约视图.json +++ b/Tables/流程表文件夹/审批历史简约视图.json @@ -40,7 +40,7 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[操作人]&\"：\"&[说明]", + "Formula": "if(ISBLANK([说明]),\"\",[操作人]&\"：\"&[说明])", "Name": "描述文本", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } @@ -51,7 +51,7 @@ "ConnectionId": "业务表", "SourceTableName": "审批历史简约视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\ncomment.[PROC_INST_ID_] as [流程实例ID],\r\nISNULL(task.[NAME_], comment.[ACTION_] ) as [进度],\r\nISNULL(comment.[USER_ID_],'系统') as [操作人],\r\nCASE \r\n WHEN (comment.[MESSAGE_] = '' OR comment.[MESSAGE_] IS NULL) THEN '处理完毕' \r\n ELSE comment.[MESSAGE_]\r\n END AS [说明],\r\ncomment.[TIME_] as [时间]\r\nFROM [dbo].[ACT_HI_COMMENT_View] comment\r\nLEFT JOIN ACT_HI_TASKINST task ON comment.TASK_ID_ = task.ID_;", + "CreateViewSql": "SELECT\r\ncomment.[PROC_INST_ID_] as [流程实例ID],\r\nISNULL(task.[NAME_], comment.[ACTION_] ) as [进度],\r\nISNULL(comment.[USER_ID_],'系统') as [操作人],\r\ncomment.[MESSAGE_] AS [说明],\r\ncomment.[TIME_] as [时间]\r\nFROM [dbo].[ACT_HI_COMMENT_View] comment\r\nLEFT JOIN ACT_HI_TASKINST task ON comment.TASK_ID_ = task.ID_;", "ViewInfo": { "ViewName": "审批历史简约视图", "IsUpdatable": true, diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index bd6ae43c..7e95440b 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -158,7 +158,7 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "DATEDIF([开始处理时间],[结束处理时间],\"d\")", + "Formula": "DATEDIF([开始处理时间],[结束处理时间],\"d\")*24", "Name": "处理用时", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" },