From 63dce96f744031a71c22f9e79ab131c6d28c27e3 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 4 Sep 2024 11:17:37 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1.=20=E6=9B=B4=E6=96=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=A5=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BB=8E?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=AF=BC=E5=85=A5=E5=B9=B6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9B\r\n2.=20=E4=BC=98=E5=8C=96=E4=BB=8E?= =?UTF-8?q?Gitee=E5=AF=BC=E5=85=A5=E5=86=85=E5=AE=B9=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8E=92=E7=89=88=E7=94=9F=E6=88=90=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=EF=BC=9B","MessageType":2,"Modules":[{"State":1,"Type":23,"Nam?= =?UTF-8?q?e":"TableView/=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":23,"Name":"TableView/=E7=BB=84=E7=BB=87=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E8=A7=92=E8=89=B2=E7=BB=84=E7=BB=87=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":23,"Name":"TableView/=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E8=A7=92=E8=89=B2=E6=8B=A5=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":23,"Name":"TableView/=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E7=94=A8=E6=88=B7=E7=BB=84=E7=BB=87=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E8=A7=92=E8=89=B2=E5=88=86=E7=B1=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":7,"Name":"Table/=E9=9C=80=E6=B1=82=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/FGC=5F=E5=95=86=E5=93=81=E8=A1=A8","ExclusiveType":0},{"State"?= =?UTF-8?q?:1,"Type":7,"Name":"Table/FGC=5F=E8=AE=A2=E5=8D=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95","ExclusiveType":0},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/FGC=5F=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8","Exclusiv?= =?UTF-8?q?eType":0},{"State":1,"Type":7,"Name":"Table/message=5Ftest","Ex?= =?UTF-8?q?clusiveType":0},{"State":1,"Type":1,"Name":"PCPage/=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=8F=8D=E9=A6=88=E5=B7=A5=E5=8D=95"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E5=8F=8D=E9=A6=88=E4=B8=8E=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8F=8D=E9=A6=88=E5=BD=95=E5=85=A5"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=8F=8D?= =?UTF-8?q?=E9=A6=88"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=8D=E9=A6=88"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":1,"Type":27,"Name":"ServerCommandPrivate/=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E5=8F=8D=E9=A6=88?= =?UTF-8?q?"},{"State":1,"Type":15,"Name":"ServerCommand/=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E6=8F=90=E4=BA=A4=E9=A1=B9=E7=9B=AE=E5=8F=8D=E9=A6=88?= =?UTF-8?q?"},{"State":1,"Type":26,"Name":"Upload"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E5=AF=BC=E5=85=A5=E5=8F=8D=E9=A6=88"},{"State":3,?= =?UTF-8?q?"Type":1,"Name":"PCPage/=E5=AF=BC=E5=85=A5=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=8F=9C=E5=8D=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 299 +------ ForguncyDB.sqlite3 | Bin 54272 -> 54272 bytes Pages/共用/导入工时内容菜单.json | 186 ++++ Pages/共用/导入工时内容菜单.rd | 15 + Pages/项目/项目反馈/反馈与建议.json | 131 +-- Pages/项目/项目反馈/处理反馈工单.json | 165 ++-- Pages/项目/项目反馈/页面反馈录入.json | 450 ++++------ Pages/项目/项目反馈/页面反馈录入.rd | 16 +- .../项目首页-容器页面/任务容器页面/任务-反馈.json | 551 +++++++++++- .../项目首页-容器页面/任务容器页面/任务-反馈.rd | 4 +- .../任务容器页面/工时/新增报工.json | 794 ++++++++++++------ .../项目首页-容器页面/任务容器页面/工时/新增报工.rd | 3 +- .../项目首页/项目首页-容器页面/项目反馈.json | 83 +- .../项目首页-容器页面/项目发布/导入反馈.json | 104 ++- .../项目首页-容器页面/项目发布/导入反馈.rd | 12 + .../项目首页-容器页面/项目发布/版本发布详情.json | 124 +-- ServerCommands/项目反馈/匿名提交项目反馈.json | 18 +- ServerCommands/项目反馈/后端新增项目反馈.json | 59 +- Tables/需求反馈/需求反馈登记表.json | 8 - 19 files changed, 1722 insertions(+), 1300 deletions(-) create mode 100644 Pages/共用/导入工时内容菜单.json create mode 100644 Pages/共用/导入工时内容菜单.rd diff --git a/.collaboration b/.collaboration index 31bc8200..5d1ef4ce 100644 --- a/.collaboration +++ b/.collaboration @@ -37,137 +37,47 @@ }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.397512+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975143+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975155+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975173+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975191+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.39752+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.397521+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975219+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3975229+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -228,16 +138,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:41:33.7048237+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "TableView/反馈收集任务匿名视图", @@ -277,47 +178,17 @@ }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3976224+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.397625+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3976268+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -354,17 +225,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.3976295+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -585,45 +446,15 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:39:27.9860968+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/反馈与建议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:38:38.6890493+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\反馈与建议.json", - "Pages\\项目\\项目反馈\\反馈与建议.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/页面反馈录入", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:38:38.6892216+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\页面反馈录入.json", - "Pages\\项目\\项目反馈\\页面反馈录入.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页", @@ -695,17 +526,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:20:26.9470223+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -713,17 +534,7 @@ }, { "ModuleName": "PCPage/任务-反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:43:15.5414234+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -791,17 +602,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:34:56.9197423+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -837,17 +638,7 @@ }, { "ModuleName": "PCPage/版本发布详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:24:55.1866696+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目发布历史", @@ -1627,29 +1418,11 @@ }, { "ModuleName": "ServerCommandPrivate/后端新增项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:40:54.9896063+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目反馈\\后端新增项目反馈.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/匿名提交项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:38:38.688623+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目反馈\\匿名提交项目反馈.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/修改项目反馈状态", @@ -2473,39 +2246,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:48:24.398139+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png", - "Upload\\443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png", - "Upload\\6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png", - "Upload\\8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png", - "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png", - "Upload\\88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png", - "Upload\\897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png", - "Upload\\d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png", - "Upload\\e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png", - "Upload\\ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png", - "Upload\\ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png", - "Upload\\f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -2541,17 +2282,7 @@ }, { "ModuleName": "PCPage/导入反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:23:56.3722756+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\导入反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\导入反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/三经理设置", @@ -2571,12 +2302,6 @@ }, { "ModuleName": "PCPage/导入工时内容菜单", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T10:19:17.5810431+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index c1f337df20f16073b5a4eccb32fb15b6fb205413..4e8a29964746f143f4085f63d6eb377cb3529341 100644 GIT binary patch delta 611 zcmX|-T}YE*6vxkbo+r1^<;S}(9d6UTeiY?Ja~BcWhs$y*#-#4V57=h7phQC02wk>C z5cqmb`tU-e3vai#%PbYGMrB}E(ICRRj1at#LbPW>J#c;;&U60f{5hlZd~}{qI7$Nm z;FIz11+?Q{45WJpxOz<1y!8?%Rf$@+gzAu}Dwn9RN+@OePj2xmYzYd$4lIk)>;c%Z zkGpj9BwJye@4E_BPDvogSEBTTCFJXIo`iHlY`m8`}}nhja?p=1#< zuZ2EFRGJAFQ#|yC`4rh*LtAZTT@36RGI2EOcz@qeW|E^g8_e&VV}s1i+-a?pVH+)_ znhHJg(|E9~T*@1TJE7X?>v%P~bCO3gX>Pn8bS9e50sWQ;7H&-bBc-btKW=Gcv z<6UKV=z1g)8j|;>{gv$!6R(%@ZeU@&1Kqqq(>nB>>|sVtZnyu#c`=zk7>d1-ngt=Z>Tuv!HFdZ4DA@55?ewD~K)(i>q;~SJ?qJhk!V%z0Y>i1A zVb`z=yDGwmj7`(?(s6XryZnYZ;xOwCDkoPa@ObcP?`#U4N5B6-2kaHgflV zp=>%@9<)?%SuN-jaigKPo{8&bon}fg&2@X1lZM9HuvI=9n`QK*=%!1>B+VC(Rj;DO z&Yyw_62Ln74fu##YMT(^2!%=yc){OHj|*P($%O(#-lB}3FSl#{LbpNvIWO*)!-_1r zSAEk@KX2Ns_1XQ`9$n>OOL<(oH>pYO;U?c>RS6S>fall;){QX;iMUg)&O1@&?+-9M zK+6;7tCK9$xTatvs+QRAz1`Zo7RQ<}5%b^bKvU(ed=QVmkT4g8G( zND0wNru+YGE)&mS`z*?au#9R4nC5iINn^oLVzd^16*D7Lz(Tn$+{{YA_ Bp2GkD diff --git a/Pages/共用/导入工时内容菜单.json b/Pages/共用/导入工时内容菜单.json new file mode 100644 index 00000000..42e8dfc9 --- /dev/null +++ b/Pages/共用/导入工时内容菜单.json @@ -0,0 +1,186 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 38.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 38.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 37.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 4 + ], + "Count": 5, + "DefaultSize": 10.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 11.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 152.0 + } + } + }, + "Count": 2, + "DefaultSize": 11.0 + }, + "Values": { + "1,1": "从Gitee导入", + "2,1": "从反馈导入" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选择项", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入工时内容菜单!B2" + } + } + ] + } + ], + "Text": "从Gitee导入", + "TemplateKey": "链接样式", + "Icon": { + "Name": "gitee.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "2,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选择项", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入工时内容菜单!B3" + } + } + ] + } + ], + "Text": "从反馈导入", + "TemplateKey": "链接样式", + "Icon": { + "Name": "报告.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 2, + "TextIndent": 8, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2, + "TextIndent": 8, + "HorizontalAlignment": 3 + } + ], + "Types": { + "Strs": [ + "Body", + "black", + "[AUTO]General", + "Left" + ] + }, + "CellStyles": { + "1,1": 0, + "2,0": 1, + "2,1": 0, + "3,0": 1, + "3,1": 2 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "点击按钮", + "Formula": "导入工时内容菜单!$B$5" + }, + { + "Name": "项目岗位菜单", + "Formula": "导入工时内容菜单!$B$3" + } + ] +}//dNqyM1LUwxcvEHjFN5dsZviCJbkcFWZDZmdzGzQuu8VgaFtM3KVFZ9UzeWvn5Y39nme8WQ8QadWUGQExqCxvpFtyp1e4+p7zpnYzBH+MiwP8AI/Vm47MeS7+x9TUnhH4vcZD/wEYe7+x3toShmzt1HJfy/QvNoNcGLCExJqu8NTNgSTq+bHSlEAeEl48XlKf8Vrb7K9+LXtzeNydpVvGyp+H6K0qW6zmW5xlpbVH5FrtiRXa4inke/GtgzzGqhe7e/v/wWeUsc3m351v+Fwrb7YsLJtrvse5dTi0hJvx2LpGO5J8nGHl8DxYa7ZLAD/j40zBDDu1dnnUSmE+TMU8nRJNXL1zJVjqGilvI8TAZjD9QL+U99BJRV3eDJLOBwYlZd+pA+LVMAF2sqqvn0aDV/3QUYUHJLKEqFzgROhjmLkq1D9jqGGTqiIaK4gnoFMMHwe9cAcLl2cdzM6j4CgXrtnYyv4+4kIKzzTpPuWzcltNFrIVpSUOWFOK/GBqQR4/S3pUgWtaK/HDYcgO+S2AfPepSyTB0MrKd05VYjOkY05JrlMs6ak7vvI0eLolEf1cDqMXoQ3B9T/53lZ3wf6q3uYEwWInMm8aVsz+UKOEV9dSQrFIqJ7jRrKzs5gth0R0HNYtSU0kL0QahIob0EHxNIUh1kjWm9k7iu+d4HnTWq73ZV4OGvhxEzyT8AVtjqOm357dmMK9AVx8IK5uL7yTf2W/fjA/4DXlpHYJ1Yqd6juf6HDWcx0JfMujagztu4aGxOtA6PPfhRaic0hw7x9I8PwCVxZsnAmAKR0EggI1O+OUwzhtAzjxTmUyYjbm4VvVR4lT5VlwSyrFajU+dfHY9D8l46BNc3vPiLgkJqjafEZfZPrAKvIfuJ+filDpNpSWzVi9YEDhV7kRvajI5Wbzzw==|920 \ No newline at end of file diff --git a/Pages/共用/导入工时内容菜单.rd b/Pages/共用/导入工时内容菜单.rd new file mode 100644 index 00000000..4b060d60 --- /dev/null +++ b/Pages/共用/导入工时内容菜单.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 2, + "RowCount": 5, + "CustomNames": [ + { + "Name": "点击按钮", + "Formula": "导入工时内容菜单!$B$5" + }, + { + "Name": "项目岗位菜单", + "Formula": "导入工时内容菜单!$B$3" + } + ] +} \ No newline at end of file diff --git a/Pages/项目/项目反馈/反馈与建议.json b/Pages/项目/项目反馈/反馈与建议.json index a9c2cf71..368be969 100644 --- a/Pages/项目/项目反馈/反馈与建议.json +++ b/Pages/项目/项目反馈/反馈与建议.json @@ -214,6 +214,11 @@ "DesignLengthInPixel": 15.0 } }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, "41": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -249,11 +254,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } } }, "InLogicalVisibleIndexes": [ @@ -847,7 +847,7 @@ ] } ], - "ID": "8c71e1d2-07c9-4d56-957b-2a8b60635185" + "ID": "1bd6c344-42aa-4e32-8f56-25813b7206c3" } ] } @@ -860,48 +860,6 @@ "35,4": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=反馈与建议!E36" - }, - "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedText", - "RetrunParamNames": { - "SelectedText": { - "SerializeProperty": "显示文本" - } - } - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=反馈与建议!P36" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(反馈与建议!显示文本=\"其他\",\"\",反馈与建议!显示文本)" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=反馈与建议!P36" - }, - "PropertyType": 1, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(反馈与建议!E36=\"\",1,0)" - } - } - ] - } - ], "UIPermissions": [ { "Scope": 2, @@ -992,35 +950,6 @@ "SecondParamValue": "12" } }, - "35,15": { - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "placeholder": "请填写功能名称", - "resize": "none" - } - }, "39,4": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", @@ -1148,14 +1077,6 @@ "SerializeProperty": "=反馈与建议!E32" } }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "功能", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=反馈与建议!P36" - } - }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "标题", @@ -1248,7 +1169,7 @@ ] } ], - "ID": "e82fd3d3-b957-4da5-8e09-a6126701dc1d" + "ID": "5ddce5b6-990c-417f-8e7b-a593fed28e28" }, { "CommandList": [ @@ -1263,7 +1184,7 @@ "BtnText": "知道了" } ], - "ID": "ad77409f-1c0d-4b42-ad0c-c19306da94d4" + "ID": "63c873f2-11f0-430b-9cfc-2e51ff6af1f9" } ] } @@ -2271,15 +2192,14 @@ "19,4,1,27", "23,4,1,27", "27,4,1,27", - "35,15,1,16", - "35,4,1,10", "31,4,1,27", "43,4,1,27", "45,15,1,5", "15,5,1,24", "2,3,2,10", "39,4,1,27", - "47,7,1,3" + "47,7,1,3", + "35,4,1,27" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2338,7 +2258,7 @@ ] } ], - "ID": "eb9234fa-3998-4abe-b246-e333f5730ec9" + "ID": "627fc0a4-4dfb-4ddb-a0ed-8798ec9d1036" }, { "CommandList": [ @@ -2483,7 +2403,7 @@ ] } ], - "ID": "7a9fc5a3-c7e7-451f-9281-12451ad2d282" + "ID": "7993d31b-a9fa-482e-b5d4-35602f19f4a2" }, { "Condition": { @@ -2522,7 +2442,7 @@ ] } ], - "ID": "43339751-5c4f-4116-842e-fc894d7795cb" + "ID": "b10b8060-38ea-4f03-9ddc-3f16c9b6a4c8" }, { "CommandList": [ @@ -2587,7 +2507,7 @@ ] } ], - "ID": "8bdd534a-b26c-4872-a678-e7f2c8189686" + "ID": "bd8c27a8-63bb-4339-a270-18d97022f31e" } ] }, @@ -2625,7 +2545,7 @@ ] } ], - "ID": "c0995b98-7578-49d5-9ef7-1c7c67640f8d" + "ID": "28ab97a7-5e0b-4d82-a5ea-7f3ba6a33ef2" } ] }, @@ -2637,12 +2557,12 @@ } } ], - "ID": "a4940c17-fb0a-4749-b475-e411bf841065" + "ID": "b6e213f3-a10a-42de-9b8e-29eaf4c42c6c" } ] } ], - "ID": "132fc1c7-d07d-419f-bc4b-cb5465ea2e8c" + "ID": "1c275e31-3088-4b02-9c98-b01c611e6428" } ] } @@ -2667,20 +2587,7 @@ "PageResponsiveMode": 1, "PageLoadingMode": 2, "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": "=1", - "GUID": "7fe8b368-fdc3-4ea7-a2b0-6145284156a0", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": true, - "IsReadOnly": false - } - ] + "Rules": [] } }, "PrintInfo": { @@ -2744,4 +2651,4 @@ "Formula": "反馈与建议!$H$48" } ] -}//CxGBlmrU18wS3g27AOkp8D5w090E/cyHF5+dQusIANuFU76W/VWLbtrtPng7v6uSbDwhwzzuUa8r+vRqmtX9cQFEFFFzxZ6FNmPpDloq5+UoLrG3h5SeC3t1tP0/hlUtH3WItQyJINyqGwRp2QPwqNEJ3q2VKdoxecGROBEOytaLHyfuWEQrEj+Fx5EDh68B3xwWjXfL9EmFEgjdKtUqQQNf1UfDRcSPGz7T5dsNUW8ZE7le7jT6BFkj4zIgLjUo6zkxBmcOZDVLuoRGGY2GNXbXX+aOfVS4tdwzH9HRObA8NB940dIzakTEIPC4sedh43krlZb3dNgA2L43znmSOjluQV0b6f2vqhLf+/U+HPcRGv6G28LsVywIT0pRYUKn2TsrgPaGcOgDv9A0hm3/RtGVdgYtJTDpDHMzwVxsbuHIlBYoHP4dQ8HA0zfQjGWE0eWWt+TYP+zYSQc1DmGkJu8XQ5anlGlMVBdTum8eXipNsFQ29oKnvxW2QvqKpygMamgRLu8ws4RgyJVSLSFyBJiInjL3sORiKIX/To4zhQyHg6CEpnT29tb2VxzLD9Q0TPKNMLMKdJr/7svaKlZ1PAUJRlwM2BFgT1VNQbq2LJfB+wy0TSMSJ4nbbQAPhKMbqszxpkwiNnpniM8Dp8LIzJfw3zThjUdFUOmHc+i50kSlB0qnf954hV9h1vuzCIFZHrBk+sl1XDaAkqR59RTTRzwLvlhSUZBKKyOIk8RDhQ6Cot4ELLqGwsNr0dWNVwaIaX3NZt5NtzAtjCcA7uQAZq0adAI+fNmki4bOTy7GyWgPEZE3Zhynk3BJ3d9rkyKm4v+duPTGr8/0oJ2gFSxlmkKOEQfoYUt6kL75bTPgEpen7MFX3NZFy6zHqHUluyuYgi9GU9CL04pqZxxZY5/QHQ==|920 \ No newline at end of file +}//nIscztfYXLJ/lJKw1Y/PQWuxZFYd2SqVB4zeTrm+wriYa6V9YT9u4rc9vmStlVEIAIg9JYujX2om594MecusMs1RwUca2Mm1pZPgjJRG0hrZm6dZzcm1Zm9KI84qw+FT/eFzqoDby3VA74C0I4+kv8n0cZx2Tg3doljXt3hEMUs6TO4fAuFv8yQdQ1pu1znEx5OTPQJRiCS4bzsjzj7DvZuRZPJf2MRVpxAoJOxtUi0Z4jjP4v3R1eMIjaHQKeHCYy/nvacer3ddqSLpHA2SJOcnfUHOk8Kix4c8rxRDSKnEMZDA5nWq61Eoro8HXqPNMin5zxnXn0Wqu1w3aQBuq83MGz4Fncjar61w3ltmD7eg7UeJDvHdSdD7oU1OBkO6r/CMxKhPJO1suw7onkDo5Xi+ErUJUHFlPNtldVTlYsRPYJIDXKVARhgXt+YTAQyZmHACI8FPCmtguolIbYYW5YF8aPn0te9X+lYqbL+heO7dPflGyd4hRAfdR776OSnIz5qt/d7R0KJbEWjrmdIu7FVJqihDXYq7pxlUxIx6xuPij3k5IEipWqAsCHK5ajnmgt4KC+BqDnWgLRWHYI8e6PTVOMGN3Q0Va2Beb6qgAP+2VwVHFPqb+eJ0t9chdT9oOjDR6kKXBfMW5RrTcHEBaJpL5Hi4w+opiaot3BGSr8mlspGUTgbVnrIqM6yr+wT4+3bvKhAFxgsz8DudiaWQfQG1curIWhApjAH0U6F44m1Y4CpBr1+40+jHwYkuAsIBr20JhiNRh0lUZnCXrqcknqwoC3HzVArd9MNPINMMFczjoHYCWMoJeOSjC4FCf26JF7+BcAQMk8f6lmkLHPa70OU1GUqnNL53fDFgr4E4bh18Nxd+qllP1YxMqEegFfWSeI0AlBlUCK1pvDWvAXDlsQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 2bdaedc1..5dcf881a 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -215,15 +215,15 @@ "0,33": "FGC_审批记录", "1,29": "展开", "3,1": "工单编号", - "3,9": "所属项目", + "3,9": "项目经理", "3,17": "紧急程度", "3,25": "状态", - "6,1": "项目经理", - "6,9": "提交人", - "6,17": "联系方式", - "6,25": "创建日期", + "6,1": "提交人", + "6,9": "联系方式", + "6,17": "创建日期", + "6,25": "开始处理日期", "9,1": "反馈类型", - "9,9": "相关功能", + "9,9": "所属项目", "9,17": "关联任务", "9,25": "下一节点处理人", "14,15": true @@ -352,11 +352,15 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", - "GUID": "c31bbbf9-7127-4cbb-843d-c453c89412ad", + "GUID": "05a90277-6f5f-4977-a729-d8610c064c23", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + }, "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", - "DisplayColumn": "项目名称" + "DisplayColumn": "项目经理" } } }, @@ -415,42 +419,33 @@ } }, "7,1": { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "项目ID", - "GUID": "05a90277-6f5f-4977-a729-d8610c064c23", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - }, - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目经理" - } - } - }, - "7,9": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "提交人", "GUID": "22a023cc-2ca3-4dc0-a902-f6e19f906a70" } }, - "7,17": { + "7,9": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "联系方式", "GUID": "4f49cf43-d936-45e2-aa65-a22f52af3376" } }, - "7,25": { + "7,17": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "FGC_CreateDate", "GUID": "d43a588a-879f-4477-b218-424e5caf2586" } }, + "7,25": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "开始处理时间", + "GUID": "60354387-8690-41c2-a64f-7be4414a0915" + } + }, "10,1": { "BindingInfo": { "TableName": "需求反馈登记表", @@ -542,37 +537,13 @@ "10,9": { "BindingInfo": { "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "0f3aedd1-d431-4a26-911e-67419f9a2433" - }, - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "resize": "none" - }, - "DataValidationInfo": { - "IgnoreBlank": false + "ColumnName": "项目ID", + "GUID": "c31bbbf9-7127-4cbb-843d-c453c89412ad", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } } }, "10,17": { @@ -902,7 +873,7 @@ "MethodName": "Refresh" } ], - "ID": "c71e92fb-9cb9-4c91-8559-712d2887a2cc" + "ID": "b5f8f7da-4111-44d8-a2c7-44495593067e" } ], "Disabled": true @@ -972,9 +943,6 @@ "FontFamily": 0, "FontSize": 14.666666666666666 }, - { - "FontSize": 14.666666666666666 - }, { "FontFamily": 0, "FontSize": 14.666666666666666, @@ -1019,7 +987,7 @@ "1,29": 3, "1,31": 4, "3,1": 5, - "3,9": 5, + "3,9": 2, "3,10": 2, "3,11": 2, "3,12": 2, @@ -1045,10 +1013,10 @@ "4,9": 7, "4,10": 2, "4,11": 2, + "4,12": 2, "4,13": 2, "4,14": 2, "4,15": 2, - "4,16": 0, "4,17": 2, "4,18": 0, "4,19": 0, @@ -1063,6 +1031,14 @@ "4,30": 0, "4,31": 0, "4,32": 6, + "6,1": 5, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, "6,9": 5, "6,10": 2, "6,11": 2, @@ -1078,7 +1054,6 @@ "6,21": 2, "6,22": 2, "6,23": 2, - "6,24": 2, "6,25": 5, "6,26": 2, "6,27": 2, @@ -1087,23 +1062,31 @@ "6,30": 2, "6,31": 2, "6,32": 2, - "7,1": 8, + "7,1": 7, + "7,2": 2, + "7,3": 2, + "7,4": 2, + "7,5": 2, + "7,6": 2, + "7,7": 2, + "7,8": 2, "7,9": 7, "7,10": 2, "7,11": 2, + "7,12": 2, "7,13": 2, "7,14": 2, "7,15": 2, - "7,16": 2, - "7,17": 7, + "7,16": 7, + "7,17": 8, "7,18": 2, "7,19": 2, + "7,20": 2, "7,21": 2, "7,22": 2, "7,23": 2, - "7,24": 7, - "7,25": 9, - "7,32": 9, + "7,25": 8, + "7,32": 8, "8,0": 2, "8,1": 2, "8,2": 2, @@ -1181,6 +1164,7 @@ "10,9": 7, "10,10": 2, "10,11": 2, + "10,12": 0, "10,13": 2, "10,14": 2, "10,15": 2, @@ -1188,6 +1172,7 @@ "10,17": 7, "10,18": 2, "10,19": 2, + "10,20": 2, "10,21": 2, "10,22": 2, "10,23": 2, @@ -1197,22 +1182,22 @@ "10,34": 2, "14,4": 0, "14,5": 0, - "14,10": 10, + "14,10": 9, "14,15": 2, "14,16": 2, "14,17": 2 }, "RowStyles": { - "5": 11, - "6": 11, - "7": 11, - "8": 11, - "9": 11, - "10": 11, - "11": 11, - "12": 11, - "13": 11, - "14": 11 + "5": 10, + "6": 10, + "7": 10, + "8": 10, + "9": 10, + "10": 10, + "11": 10, + "12": 10, + "13": 10, + "14": 10 }, "SheetStyle": { "FontFamily": 0 @@ -1221,24 +1206,24 @@ "Spans": [ "12,1,1,31", "14,1,1,3", - "7,9,1,7", - "7,17,1,7", "10,1,1,7", - "10,17,1,7", - "10,9,1,7", "10,25,1,7", "4,1,1,7", "4,25,1,7", "4,17,1,7", - "4,9,1,7", - "7,1,1,7", - "7,25,1,7", "1,1,1,16", "0,33,14,1", "14,6,1,3", "14,10,1,4", "1,29,1,2", - "14,15,1,3" + "14,15,1,3", + "10,17,1,7", + "10,9,1,7", + "4,9,1,7", + "7,1,1,7", + "7,9,1,7", + "7,17,1,7", + "7,25,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1270,4 +1255,4 @@ "Formula": "处理反馈工单!$B$15" } ] -}//6nekJwrhLRtqGu06yCSv5Hwqp3keLa+AkaWgrddwmNbrHUHN4N09g35MzZ9iK7NLOMFOJBP+VdaVqbyo+S0ixn4V2pUJoXnSTW1+5n2Jd5+VVmxR5OHopklg43ybpsCr17Xgd9EkHoJA5l2gdGER15R2zJ0S/8GeutYSh+H17LRajmtHUJGlvBuQZbSWZB0MguR+RQMslE9i/wupad8gkDKkuOYvow2DTb0TRy6D556eUxZ3p7E2LLw+eT+V0GAoLCXy07C9tGLOWkdDYfXwpmwT9ysiMyUf5J1KskV4HB5Z8MQmV8J8ZUou4co/g9yJlEG8FMejGpXuC8gqiK4AJiOcNFpPQfHLVf7HPoHOa3rjJ+blklaDYe/osAqg7gDkCwRg3MXkGZbDRZ0bjL1MhW66McrSueoN/3zJrgHVevBRpxXWh+xkpmVrWjlMw7+XgYPkDislpI+mNInLQkf3R39phZdDAJyHejvnreGQoSor/EpMoerOD356rf8oldZhwCkWrEg1JTBKxggiQJrJYnsgVzD4/erxcpFwgOBCE05S9sEeFFkQ9GpJ6a9bW7dDbqzeK1yMBIwJY1QeEVEpaC4dP4xkOGnosxr59PgC8HKDiOuifOaM339p5yvdGNVSj7JAIbfZaNZ34tBN4oJ9OaLopKpdvWeATkzQw+1ym2yFk3H7BGwQfQ38yhPvll5b2sk0P7HSYuQAlh5rqDMmsXXJsE2vGC8iCXbTI9A+NUk9j5oNZoJd5GZh4c4/Z9YQFON5/RLnbbeeakktEGpM6Y0Q8Hm71hkPKQ1+4uV268JEt807IpElkI9g2fLDO2VzVDqidihM/O97FJib5eIFu7blUO6RGnzm1yZtPd2Q1wS4bJx2gkWJSr079wDPtVkKWsT33dtpPOLCAmi7vihsOQ==|920 \ No newline at end of file +}//V1afEwQ7isdgL27I+Ub2FhsUfDFto4ZPNcLraW5E0dogUj0RHV3xFEA68aDIBSMS4mxaz104aUCeiWKsWsGj34mzIEX9rxlR9q+Kcchnv5NeXQiK++XkO1mW2b26ADqKiSD7SCfv//vuhWueTKkyPlr0auYBTZ6EhkBgFd4lpUXFMQdRVt3oRAn6thGEjwc4da8rWgwJcBEAiquHMAPmOwAVcM8y4UtOA5mvEImwXF5Lyf30I5JtV7n5CYR4pDp2Zl96GEUxqkD56yIAZsxBwlT2B9HLuloLbcrXtyCDALDpk6oEA/08d/XoBQEOTHwbyhE63rZc17G8XDx2lwrnj6foIouYyK6TmZ0EZZ02QaV8NjHGj5SDsWZfH28b7zrg5sNQr/ZAO7T4IqNJg59lA4Y4BXcWJ9WJJ1xzxSWm66JvIcwgXTM0uhc2scvjpNz4OU7PrDCcJam3JK8nhcG6IxYpsWuXjHlcKezAMgPq4zeTrolinMImFaVbU3jQeP/Ncvn03GI7HJS9r4G81h+ZCVdXfRULGKq7BMk0fq9oAoKNTWxy7HeDp++IIauriBy8aZkEFH5Wv8aBLH2WTZO9Tf8+42bTu3R/NrI9bjLcXAyULGXV8hft6CRnPQw/7ImcXQ/kSKLKfDF5UZeQaFVioXMwECOMYV1g1CKwNNx5GTvtkgHf7mLThjANe6aXoOgZJYk4j/DNMl/3z/122zDtqUTQKJUitSK6cGHn8xG/YpL40pfYUIsYZplyN77uu7MKgX57dNnT/r7FHre3L+9Y0rowaLwkWPICB8Zl2saVUt/WNufLbtqGrqc8p4xRGkDu2br381t3fvDz+KQasEEzQAQo+vDh2TdmW+RqQFk5B3cnLWSWpLHAZmDSfiOekxxB0xLtXjnUZh0eFv14Ke1YyQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json index d8842ece..d16df82a 100644 --- a/Pages/项目/项目反馈/页面反馈录入.json +++ b/Pages/项目/项目反馈/页面反馈录入.json @@ -71,11 +71,6 @@ "DesignLengthInPixel": 35.0 } }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -87,21 +82,6 @@ } }, "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 440.0, "Mode": 2, @@ -113,33 +93,33 @@ } } }, - "22": { + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "23": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "24": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 36.0 } }, - "25": { + "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "26": { + "22": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } }, - "27": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "IsHidden": true @@ -147,10 +127,10 @@ } }, "InLogicalVisibleIndexes": [ - 26, - 27 + 22, + 23 ], - "Count": 28, + "Count": 24, "DefaultSize": 32.0 }, "Cols": { @@ -338,20 +318,18 @@ "3,2": "01", "3,3": "关联任务", "7,2": "02", - "7,3": "功能说明", + "7,3": "反馈类型", + "9,3": 1, "11,2": "03", - "11,3": "反馈类型", - "13,3": 1, + "11,3": "标题", "15,2": "04", - "15,3": "标题", - "19,2": "05", - "19,3": "需求描述", - "24,27": "提交", - "26,2": "项目ID", - "26,7": "反馈表ID", - "26,13": "当前用户", - "26,16": "%CurrentUser%", - "26,19": "%CurrentUser.Email%" + "15,3": "需求描述", + "20,27": "提交", + "22,2": "项目ID", + "22,7": "反馈表ID", + "22,13": "当前用户", + "22,16": "%CurrentUser%", + "22,19": "%CurrentUser.Email%" }, "AttachInfos": { "5,3": { @@ -700,40 +678,6 @@ } }, "9,3": { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "1376acd1-87f1-49a4-ae9e-4b897216710d" - }, - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "placeholder": "请描述遇到问题的功能", - "resize": "none" - } - }, - "13,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", @@ -765,7 +709,7 @@ "IgnoreBlank": false } }, - "17,3": { + "13,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "标题", @@ -804,7 +748,7 @@ "IgnoreBlank": false } }, - "21,3": { + "17,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", @@ -831,7 +775,7 @@ "IgnoreBlank": false } }, - "24,27": { + "20,27": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -942,14 +886,6 @@ "SerializeProperty": "=页面反馈录入!反馈类型" } }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "功能", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!功能说明" - } - }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "标题", @@ -979,7 +915,7 @@ "ParamName": "联系方式", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!T27" + "SerializeProperty": "=页面反馈录入!T23" } } ], @@ -1001,38 +937,69 @@ "CheckDataValidation": true }, { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": "提交成功！", - "Type": "success", - "Duration": 3000, - "Offset": null - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "提交成功！" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "47f23193-aad5-4501-825d-3f4dfc33e797" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=页面反馈录入!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "013f39ae-a5f8-4b15-97c9-e364fe7e5d2b" + } + ] } ], - "ID": "efb38b99-c3c6-4c1b-9cb9-9d2684228760" + "ID": "dcb02ece-e403-4393-a1e2-0fe183154c73" }, { "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", "Message": "请完整填写反馈内容！", - "Type": "warning", - "ConfirmButtonText": "确定", - "CancelButtonText": "取消", - "ShowClose": false, - "AdvancedSettings": {} + "BtnText": "知道了" } ], - "ID": "2d78c185-90e4-46d4-b3b9-eb508b7bd048" + "ID": "ec88b549-d68d-4a08-bd01-3682d02d628b" } ] } ], - "ID": "18d1ec87-68a5-4e9d-830d-9879060fb7bc" + "ID": "b82637d0-541b-42cc-93cf-2f5b70b5af9a" }, { "CommandList": [ @@ -1046,7 +1013,7 @@ "Message": "保存完成" } ], - "ID": "cdf75c59-f681-4b5a-bfea-208b8a21ae80" + "ID": "803bc52b-4353-49e9-abe6-0d5d32ccb405" } ] } @@ -1055,14 +1022,14 @@ "TemplateKey": "_RS_Main1" } }, - "26,4": { + "22,4": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "4e356784-9a58-4a60-85ab-4ba5a9ad79c3" } }, - "26,10": { + "22,10": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "ID", @@ -1105,11 +1072,11 @@ }, { "FontFamily": 3, - "HorizontalAlignment": 9 + "HorizontalAlignment": 6 }, { "FontFamily": 3, - "HorizontalAlignment": 6 + "HorizontalAlignment": 9 }, { "FontFamily": 3, @@ -1253,7 +1220,7 @@ "7,9": 3, "7,10": 3, "7,11": 3, - "7,12": 6, + "7,12": 3, "7,13": 3, "7,14": 3, "7,15": 3, @@ -1271,7 +1238,7 @@ "7,27": 3, "7,28": 3, "7,29": 3, - "8,2": 3, + "8,2": 6, "8,3": 3, "8,4": 3, "8,5": 3, @@ -1299,36 +1266,38 @@ "8,27": 3, "8,28": 3, "8,29": 3, - "9,2": 3, + "9,2": 6, "9,3": 3, - "10,2": 3, - "10,3": 3, - "10,4": 3, - "10,5": 3, - "10,6": 3, - "10,7": 3, - "10,8": 3, - "10,9": 3, - "10,10": 3, - "10,11": 3, - "10,12": 3, - "10,13": 3, - "10,14": 3, - "10,15": 3, - "10,16": 3, - "10,17": 3, - "10,18": 3, - "10,19": 3, - "10,20": 3, - "10,21": 3, - "10,22": 3, - "10,23": 3, - "10,24": 3, - "10,25": 3, - "10,26": 3, - "10,27": 3, - "10,28": 3, - "10,29": 3, + "10,2": 6, + "10,3": 4, + "10,4": 4, + "10,5": 4, + "10,6": 4, + "10,7": 4, + "10,8": 4, + "10,9": 4, + "10,10": 4, + "10,11": 4, + "10,12": 4, + "10,13": 4, + "10,14": 4, + "10,15": 4, + "10,16": 4, + "10,17": 4, + "10,18": 4, + "10,19": 4, + "10,20": 4, + "10,21": 4, + "10,22": 4, + "10,23": 4, + "10,24": 4, + "10,25": 4, + "10,26": 4, + "10,27": 4, + "10,28": 4, + "10,29": 4, + "11,0": 3, + "11,1": 3, "11,2": 1, "11,3": 5, "11,4": 3, @@ -1339,7 +1308,7 @@ "11,9": 3, "11,10": 3, "11,11": 3, - "11,12": 3, + "11,12": 7, "11,13": 3, "11,14": 3, "11,15": 3, @@ -1357,7 +1326,11 @@ "11,27": 3, "11,28": 3, "11,29": 3, - "12,2": 7, + "11,30": 3, + "11,31": 3, + "12,0": 3, + "12,1": 3, + "12,2": 3, "12,3": 3, "12,4": 3, "12,5": 3, @@ -1385,9 +1358,15 @@ "12,27": 3, "12,28": 3, "12,29": 3, - "13,2": 7, + "12,30": 3, + "12,31": 3, + "13,0": 3, + "13,1": 3, + "13,2": 3, "13,3": 3, - "14,2": 7, + "13,30": 3, + "13,31": 3, + "14,2": 6, "14,3": 4, "14,4": 4, "14,5": 4, @@ -1415,8 +1394,6 @@ "14,27": 4, "14,28": 4, "14,29": 4, - "15,0": 3, - "15,1": 3, "15,2": 1, "15,3": 5, "15,4": 3, @@ -1427,7 +1404,7 @@ "15,9": 3, "15,10": 3, "15,11": 3, - "15,12": 6, + "15,12": 3, "15,13": 3, "15,14": 3, "15,15": 3, @@ -1445,123 +1422,27 @@ "15,27": 3, "15,28": 3, "15,29": 3, - "15,30": 3, - "15,31": 3, - "16,0": 3, - "16,1": 3, - "16,2": 3, - "16,3": 3, - "16,4": 3, - "16,5": 3, - "16,6": 3, - "16,7": 3, - "16,8": 3, - "16,9": 3, - "16,10": 3, - "16,11": 3, - "16,12": 3, - "16,13": 3, - "16,14": 3, - "16,15": 3, - "16,16": 3, - "16,17": 3, - "16,18": 3, - "16,19": 3, - "16,20": 3, - "16,21": 3, - "16,22": 3, - "16,23": 3, - "16,24": 3, - "16,25": 3, - "16,26": 3, - "16,27": 3, - "16,28": 3, - "16,29": 3, - "16,30": 3, - "16,31": 3, - "17,0": 3, - "17,1": 3, - "17,2": 3, - "17,3": 3, - "17,30": 3, - "17,31": 3, - "18,2": 7, - "18,3": 4, - "18,4": 4, - "18,5": 4, - "18,6": 4, - "18,7": 4, - "18,8": 4, - "18,9": 4, - "18,10": 4, - "18,11": 4, - "18,12": 4, - "18,13": 4, - "18,14": 4, - "18,15": 4, - "18,16": 4, - "18,17": 4, - "18,18": 4, - "18,19": 4, - "18,20": 4, - "18,21": 4, - "18,22": 4, - "18,23": 4, - "18,24": 4, - "18,25": 4, - "18,26": 4, - "18,27": 4, - "18,28": 4, - "18,29": 4, - "19,2": 1, - "19,3": 5, - "19,4": 3, - "19,5": 3, - "19,6": 3, - "19,7": 3, - "19,8": 3, - "19,9": 3, - "19,10": 3, - "19,11": 3, - "19,12": 3, - "19,13": 3, - "19,14": 3, - "19,15": 3, - "19,16": 3, - "19,17": 3, - "19,18": 3, - "19,19": 3, - "19,20": 3, - "19,21": 3, - "19,22": 3, - "19,23": 3, - "19,24": 3, - "19,25": 3, - "19,26": 3, - "19,27": 3, - "19,28": 3, - "19,29": 3, - "26,2": 8, - "26,3": 8, - "26,4": 8, - "26,5": 8, - "26,6": 9, - "26,7": 8, - "26,8": 8, - "26,9": 8, - "26,10": 9, - "26,11": 10, - "26,12": 10, - "26,13": 8, - "26,14": 8, - "26,15": 8, - "26,16": 9, - "26,17": 10, - "26,18": 11, - "26,19": 3, - "26,20": 3, - "26,21": 3, - "26,22": 3 + "22,2": 8, + "22,3": 8, + "22,4": 8, + "22,5": 8, + "22,6": 9, + "22,7": 8, + "22,8": 8, + "22,9": 8, + "22,10": 9, + "22,11": 10, + "22,12": 10, + "22,13": 8, + "22,14": 8, + "22,15": 8, + "22,16": 9, + "22,17": 10, + "22,18": 11, + "22,19": 3, + "22,20": 3, + "22,21": 3, + "22,22": 3 }, "SheetStyle": { "FontFamily": 3 @@ -1569,19 +1450,18 @@ }, "Spans": [ "1,1,1,30", - "21,3,1,28", - "13,3,1,27", - "24,27,1,4", + "17,3,1,28", + "20,27,1,4", "5,3,1,27", "9,3,1,27", - "26,2,1,2", - "26,4,1,3", - "26,7,1,3", - "26,10,1,3", - "26,13,1,3", - "26,16,1,3", - "26,19,1,4", - "17,3,1,27" + "22,2,1,2", + "22,4,1,3", + "22,7,1,3", + "22,10,1,3", + "22,13,1,3", + "22,16,1,3", + "22,19,1,4", + "13,3,1,27" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1623,19 +1503,19 @@ "CustomNames": [ { "Name": "当前用户", - "Formula": "页面反馈录入!$Q$27" + "Formula": "页面反馈录入!$Q$23" }, { "Name": "反馈表ID", - "Formula": "页面反馈录入!$K$27" + "Formula": "页面反馈录入!$K$23" }, { "Name": "反馈类型", - "Formula": "页面反馈录入!$D$14" + "Formula": "页面反馈录入!$D$10" }, { "Name": "功能说明", - "Formula": "页面反馈录入!$D$10" + "Formula": "#REF!" }, { "Name": "任务ID", @@ -1643,15 +1523,15 @@ }, { "Name": "项目ID", - "Formula": "页面反馈录入!$E$27" + "Formula": "页面反馈录入!$E$23" }, { "Name": "需求描述", - "Formula": "页面反馈录入!$D$22" + "Formula": "页面反馈录入!$D$18" }, { "Name": "标题", - "Formula": "页面反馈录入!$D$18" + "Formula": "页面反馈录入!$D$14" } ] -}//8LCBvs8EcX7ftrscj5u0RbafwbRBY/3QL/LOFEfFVK9FXTGlluSExpGGRY7imWKCMz28kFb1rFRhA/pFGzSAGpGdpZkJH0QdsIfoS96UuIBcI6ijLzsV51vkwq9xNDNiNZd+6Dwae2jz4ROw/FT2dpeZzeqQn7ZII/j+G7BupelnlrVeFsynB792Km9av9coA2ZqD8TQ999aFp4ADs1CaRZu9tUr+lTpfsQrtTQNpQCugyfaFgPojLQJrooYk4dkG4kkAAjUUL5PYHq+JsfpXvGZfmNZWrkNJ+FnIfZ0AzrBfNaS1QOKVZcg9T3BI6cuouvcydzn142bMpgO8bSzV8npm9zoK9PPn2BQjsplibEBKbfBDL9ltt0QbprNY/kxWRkdHxesIoNYaCZRgh6M+5uSJpGwD6yx2IFxLRl6Q0kkmFa9Voesui7P86G1+rEAVYJfZQ7NraSX0qcC5rbXvUaE/ttM2RLYUvdzqdayfdyBjY85qt7gaX6kjQOu1h54L9CzTa5WS6TY/VsyVN7ngPFZ2v9PVWekytmK0Eryhb8+PR8P/oZ0pcE1DeiATNFNYveCjX//17GsO5iJtCRb1fNZDYXzSpRiS/o/WvDLAtHAd2EIY6OFOfofVEqywiKUNSoEt1PjYPt8K5oTZ6O2cwPtje0Bg8NY1NXhI73vFZP3bQhfdDwtsME/X+xmnS66MQWZMpbmff3aahlM5nL0kuyEX+KPLzN8d4df1krqNfJLMFeAp+IKNVwnYikeaJBww7prAdQ0tq58Q+6HC8v4WFIftM8xu1xum2Mf3p30ZZm224SI6QoT1P0uSOLbOkDg8LGq1ThiIjrqDOdCant0p5jcQO+0m7HYu12VZ1ik23pFNkMCVsYFDRUAluB4XJdJn8Jhvy/sR2Ij4KaKG57s1Q==|920 \ No newline at end of file +}//hHIQqDMRKOnLPFbR22VHzBWJu1K517W2nLijVnOmpVXmXt7NFxE/ZkJJ7c7GbcRpUWE4qvZR813mQQM8AKoNjLJx94tymmv2pQnar1Y/+BGJnLCG9ejKEy8kExFVNNm1TIPpg8fOXGQHdIY4ZCKPkyuzE2ruFzt69ch7MRWucAdZor/aqP+ef+tSn/jjdyv8/ycArp4sHA6SRWSsBcN1TITdLIF6UtgJ1oSLEUP3Wzh+DP6TJIU17QfWn0OCQshz0u71EBsT6CxF1mhfw5eVtkRpPt5L6VvsDcGJOWeaVoKx3Asp7S5Z7Czlbw1uowUyMnHKtt5Xxpa9C/GzLAfxJVOxNQkcvE2adpZE5hZsjNA8U8zkZPZAzlOtPwVcIb5Ra0Is59I7lnT6bClN1vXdNXE88M05r/29upM5euZHs7AzVLesulvTypwGOmpSzvEk/gMcmqFNbiH83nJWBVkUn75mATW+XTB2CdibsbWY1wRW4HU5GEoJs05DPF3Y9EBf17X6XNahv31m/BuKBQcxsaqa8DGk/yPJe2AyzV6TeYHApMXUJp/0E2QsXaEGsAGPc4LTyAp1GZ+/Sl2ytzcjruExwu4yGPYW/bZMLWxD+uzsmaY4fB7Ps/ZfRlRkyBpqHvCmXpyTKMUjGXz6apOLwmO6UY5xVQzL8/nlduW1eb5Cclf+SLFCPykmLM7tto612IdHFRHXYeE1ETssPRaKqtyZl4TiLgfDWq4AhtzjekBsJnU+n2kmySZH2F898+bBMkpmihhEn+jN5u0dFvM+f4YyypbDeTYtUI/yd4JEscXlwED+oFtN5Dw3vJB1ufBxLEKMGaQGNrD3QHhfefbqgGXpwOC3ejPxcV26V97qcP5e6U9Osi76ZGZEyUWdtU6h3RCHPKmY/+3nRuNRFDRVNg==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.rd b/Pages/项目/项目反馈/页面反馈录入.rd index 82acc8f8..c6557cb5 100644 --- a/Pages/项目/项目反馈/页面反馈录入.rd +++ b/Pages/项目/项目反馈/页面反馈录入.rd @@ -1,23 +1,23 @@ { "PageType": 0, "ColumnCount": 32, - "RowCount": 28, + "RowCount": 24, "CustomNames": [ { "Name": "当前用户", - "Formula": "页面反馈录入!$Q$27" + "Formula": "页面反馈录入!$Q$23" }, { "Name": "反馈表ID", - "Formula": "页面反馈录入!$K$27" + "Formula": "页面反馈录入!$K$23" }, { "Name": "反馈类型", - "Formula": "页面反馈录入!$D$14" + "Formula": "页面反馈录入!$D$10" }, { "Name": "功能说明", - "Formula": "页面反馈录入!$D$10" + "Formula": "#REF!" }, { "Name": "任务ID", @@ -25,15 +25,15 @@ }, { "Name": "项目ID", - "Formula": "页面反馈录入!$E$27" + "Formula": "页面反馈录入!$E$23" }, { "Name": "需求描述", - "Formula": "页面反馈录入!$D$22" + "Formula": "页面反馈录入!$D$18" }, { "Name": "标题", - "Formula": "页面反馈录入!$D$18" + "Formula": "页面反馈录入!$D$14" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json index 358d1e26..13b21aba 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json @@ -36,15 +36,34 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, + "DesignLengthInPixel": 21.0, "IsHidden": true } }, "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 241.0, + "Mode": 1, + "IsHidden": true + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 44.0, + "Mode": 1, + "IsHidden": true + } + }, + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } } }, "InLogicalVisibleIndexes": [ @@ -52,9 +71,12 @@ 4, 5, 6, - 7 + 7, + 8, + 9, + 10 ], - "Count": 8, + "Count": 11, "DefaultSize": 10.0 }, "Cols": { @@ -151,8 +173,8 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "任务反馈", - "7,18": 1 + "1,1": "收集反馈", + "10,18": 1 }, "Formulas": { "1,21": "IF(折叠任务反馈,上箭头,下箭头)" @@ -178,7 +200,7 @@ ] } ], - "Text": "任务反馈", + "Text": "收集反馈", "TemplateKey": "链接样式", "Icon": { "Name": "简介.svg", @@ -265,7 +287,7 @@ ] } ], - "ID": "2aa9b93c-e694-4dae-816b-962f8def3ec8" + "ID": "41aaca37-48b0-4503-8806-85092f16118b" }, { "CommandList": [ @@ -303,12 +325,12 @@ "MethodName": "Focus" } ], - "ID": "f28fb1a0-017c-49d6-90fb-ffb419c904af" + "ID": "a509894c-fddc-45fb-9bc5-14edc94a5214" } ] } ], - "ID": "05b1e763-e36d-49d5-93f2-ca97e4f47360" + "ID": "85d8e9e9-cd6c-4f17-8049-804ffb95cd22" } ] } @@ -434,7 +456,7 @@ ] } ], - "ID": "78329665-01bf-4d30-996f-1e977abc5141" + "ID": "aeec578b-617b-4fbe-9ba1-9524b7a4f0d1" }, { "Condition": { @@ -456,12 +478,12 @@ "Message": "清空功能名称，请先关闭收集反馈" } ], - "ID": "c8786d80-4a20-4a30-9014-3f740b8153d3" + "ID": "06463dac-18f5-46ed-ac76-d0d79bbfe454" } ] } ], - "ID": "04402bc2-8562-4494-a574-1e7bbe45b453" + "ID": "76792d06-2a5b-45dc-87bf-e642fd7007da" } ] } @@ -488,7 +510,7 @@ ], "DefaultValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-反馈'!任务名称" + "SerializeProperty": "=IF('任务-反馈'!任务名称=\"\",\"\",'任务-反馈'!任务名称)" }, "type": "text", "maxlength": "12", @@ -560,7 +582,7 @@ ] } ], - "ID": "ba544485-3571-4416-8acf-b55fa687ab24" + "ID": "96ae811e-dfef-4f97-9f5f-0789725e53ca" } ] } @@ -598,7 +620,435 @@ "resize": "none" } }, - "7,18": { + "7,2": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "BindingInfos": [ + { + "GUID": "dae6f41a-c126-49af-ad54-6dedb47d0a4c", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "bfa40a76-1974-493f-abd7-eb64a793493e" + }, + "ColumnName": "ID" + }, + { + "GUID": "156b2fe3-d8c5-446c-857a-b6102f369287", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "工单编号", + "GUID": "883b8fc5-9dfd-4107-a67d-06d52186fb17" + }, + "ColumnName": "工单编号" + }, + { + "GUID": "43ada8c5-9b85-4372-b023-f7bb50dffe56", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "反馈类型", + "GUID": "0f1d3596-295b-4c98-91f2-dc12abae4060", + "RelationBinding": { + "RelatedTable": "反馈类型表", + "RelatedColumn": "ID", + "DisplayColumn": "反馈类型" + } + }, + "ColumnName": "反馈类型" + }, + { + "GUID": "cb5aa70a-ba7a-45b5-adbb-e0d8442960f6", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "标题", + "GUID": "2e4ea8c1-b192-4cfa-89ca-d82a43223c68" + }, + "ColumnName": "标题" + }, + { + "GUID": "971f7f0f-dfea-4759-9228-6209c2abe06c", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "提交人", + "GUID": "fdcbd160-17b7-4533-a2ae-628b42e12302" + }, + "ColumnName": "提交人" + }, + { + "GUID": "e475dec7-e83a-46e0-aeb9-262190dcac3e", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "处理人", + "GUID": "95d0f6f7-2c46-444c-ba90-148296cedbc9" + }, + "ColumnName": "处理人" + }, + { + "GUID": "9818b893-2439-4680-9587-9c28a5990825", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "开始处理时间", + "GUID": "ba9e4ff8-45b1-4036-b4ab-eeec8d95115d" + }, + "ColumnName": "开始处理时间" + }, + { + "GUID": "4cbdf932-b7f8-48a7-9782-eb024f4bae8c", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "结束处理时间", + "GUID": "5713063d-8099-4b5a-815d-ea5dd7dfbced" + }, + "ColumnName": "结束处理时间" + }, + { + "GUID": "f84d6bca-406a-4feb-87c2-6db628b8950a", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "15784b6a-837b-4bb6-9c52-611316f1ca91", + "RelationBinding": { + "RelatedTable": "反馈状态表", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + }, + "ColumnName": "状态" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "关联任务", + "GUID": "0ea16ab5-e5ac-4f40-94ca-e44a449c894f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!任务ID" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "开始处理时间", + "GUID": "86ff29ec-277f-4847-9bbd-02b37afe5415" + }, + "Order": 0 + }, + { + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "FGC_CreateDate", + "GUID": "09bb23a6-891c-4f48-ab07-78d2871bb9cf" + }, + "Order": 0 + } + ] + }, + "CacheSetting": { + "AllowCache": true + }, + "CustomColumns": [] + }, + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "54404f77-721e-4190-924d-5da0c96b829f", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "工单编号", + "label": "工单编号", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "29e98c9b-a3b5-49f1-9ddf-e4bf13a61af6", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "反馈类型", + "label": "反馈类型", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "key": "2e0ecb42-9dd8-4893-9dd8-47b7b211bce3", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "标题", + "label": "标题", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "d791902f-2ec3-4745-a2a7-8c3a56c355f2", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "提交人", + "label": "提交人", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "aceb68dc-3141-4fd5-8af6-f74c4de70ea5", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "处理人", + "label": "处理人", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "ec19477d-2979-47a0-b033-254342a1f301", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "开始处理时间", + "label": "开始时间", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "590dd501-012f-4317-b593-5f68c3ad8f87", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "结束处理时间", + "label": "结束时间", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "812fd701-19f7-4559-af3a-3ca259cef384", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "状态", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Tag", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "c3669ff5-51eb-4447-8c67-dcc647294e12", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "sumText": "合计", + "size": "small" + } + }, + "8,2": { + "CellType": { + "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", + "AttachElementTable": true, + "ElementTableName": "EL表格1", + "pagerCount": 7, + "layout": [ + { + "layoutItem": "prev" + }, + { + "layoutItem": "pager" + }, + { + "layoutItem": "next" + }, + { + "layoutItem": "jumper" + }, + { + "layoutItem": "->" + }, + { + "layoutItem": "total" + } + ], + "pageSizes": [ + {}, + { + "value": 20 + }, + { + "value": 30 + }, + { + "value": 40 + }, + { + "value": 50 + }, + { + "value": 100 + } + ], + "small": true, + "hideOnSinglePage": true + } + }, + "10,18": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -610,7 +1060,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-反馈'!4:7" + "SerializeProperty": "='任务-反馈'!4:10" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -726,24 +1176,47 @@ "6,19": 5, "6,20": 5, "7,2": 5, - "7,3": 5, - "7,4": 5, - "7,5": 5, - "7,6": 5, - "7,7": 5, - "7,8": 5, - "7,9": 5, - "7,10": 5, - "7,11": 5, - "7,12": 5, - "7,13": 5, - "7,14": 5, - "7,15": 5, - "7,16": 5, - "7,17": 5, - "7,18": 6, - "7,19": 7, - "7,20": 7 + "7,20": 5, + "8,2": 5, + "8,20": 5, + "9,2": 5, + "9,3": 5, + "9,4": 5, + "9,5": 5, + "9,6": 5, + "9,7": 5, + "9,8": 5, + "9,9": 5, + "9,10": 5, + "9,11": 5, + "9,12": 5, + "9,13": 5, + "9,14": 5, + "9,15": 5, + "9,16": 5, + "9,17": 5, + "9,18": 5, + "9,19": 5, + "9,20": 5, + "10,2": 5, + "10,3": 5, + "10,4": 5, + "10,5": 5, + "10,6": 5, + "10,7": 5, + "10,8": 5, + "10,9": 5, + "10,10": 5, + "10,11": 5, + "10,12": 5, + "10,13": 5, + "10,14": 5, + "10,15": 5, + "10,16": 5, + "10,17": 5, + "10,18": 6, + "10,19": 7, + "10,20": 7 }, "RowStyles": { "2": 8 @@ -757,11 +1230,13 @@ } }, "Spans": [ - "7,18,1,3", + "10,18,1,3", "1,1,1,4", "1,16,1,4", "5,2,1,18", - "3,2,1,18" + "3,2,1,18", + "7,2,1,18", + "8,2,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -822,7 +1297,7 @@ "CustomNames": [ { "Name": "折叠任务反馈", - "Formula": "'任务-反馈'!$S$8" + "Formula": "'任务-反馈'!$S$11" } ] -}//78xzfddHnCctEPVmxcQ23Rw+WFTgWdnrcDsjnbxl/YvsPioMG+t/BcGMVMDYaH/EDQeVfPBdodyar3JoExstQdxYG12LR0ZLr93kspV6SydnfLWUp1A/oVfJUjiNCZ2cl1WTEqoGxkB6NY4XEyzMkShW1Q/j60SYObxhJ1LUZ+IVbmmO1fEcXSJfWfh5trH++Yl8Eg6HPhPwJLm4/qr72muHmGamJQZggOp/uFjOQnvrj9wAO9JnNjy2in19CFhREqC54NlthbTLXPcG3Db0VLQtcXRKavd/vk8MDgafoVcZK3kIABFRwZyowkMwZupVX+5rraVLeeLUhIW38/pwCR6MXlghqF+dbP1yY97ErXYq8RmEJO6zrsaO19KW23I4xtOJk8Ei2H572/nBfJdrVC/vBj9nBRsUndJR2AoLeFvjVOAyjBx3HtLG0ayt4kUIOmqBZgrnuIoaNeOHR7RH1aDeExTOE8790OrzL+52Z+ef+0nsOHPaTmBodJQZP8w4cz3RYVLeie369W7GBuBM/U2PqkZIVI4GH9eS4SFeUUGtCaB6Mhsn38vDPWPnSc186DGXExZ1abaBKQYrllaV/XrHVo9giwDI+deE6CLMlN/eMFurKyDQCxbGuFZ3FYdhzzMlu2zp0bd57aRlpHSu0TlMoVo3k8fAqB+gMLFVUYjwG8Z+zruaX56I1y56ucWGb4lseCYJgUFjAE/UvzyMi2SLu+y4RQR/0sY3v+rXQR2DrURO3anGgXm230LsWdwE0C6RIkhcb/IryPsivL0GgiJD9GOqRVF/eXtoLHU0ISVlQGoOfYfsKAeg0ckFs6fEhq7jqNODB+ofKtm/R9lhdjBCZqEt2Mk8F3P2Bl4bIYh+48egwYjnnvuanSRJmgn06Mx9Bcl34zwA+8oz1BoJ7Q==|920 \ No newline at end of file +}//7IYexzwKuDDkYJCgCONTmAVUvmop8i4QOWD+HKeDHE8/+3PVrHgJgVjiquQm7nploopGo5qPEnlSPNGEjKAh7ve6+UIwxKZWIhBNaXehGQJSdbhblbhIeRF4TpQaNZwQFX4BUgbQ2XGX0kcVuO280tQtyDh9vLzYxcyIXaSkOypVcKMylwIyk5HYmHDplYuYYXeBB0lDxQiv4CMCb83+FgtnrYkvCdpjJ2hYPEm3GpfVAcM+WEb2WI+TP5vbqc1lEMrrJo2thCzszoNbKo0Iw1/wty0nsDXrD3vo7UBNo/zPjmHLZWHWNM/K+1HUpCcvq+v7mALiC0ntd1I7Lma+2ThtXTleEjeiBzqfY8b1OnEof/QFpJO14StXzc7zGvb1HwenNiC+wCqTvl+TqQlmdoVKgxXi8gtURYelxeJXxJXUP3FYYPOaR5ovAw3hcVPP9RN7Tfw3zzh/9sRRmDORKJXjrOug6DCeJwUsqszN2yCWz8eoFReBZEYPrApakBqS5LD4pJyNSaff0xcxNc7r06HMhrBmFQigCbwtmd814OH03WDDf7ifn2zRn5tg37J0LoB/yElwibz2oErnhD5d8cmpJkKF2Iz/ZYbGN3ON/y3J9HB6RcLdoR805rZ4EV0UZryrS1I2qPT54Qhua6o0pvhs+0/4BqWiocoKEJ++yHP7Gb/9vL0IMiPCX6JkyvbUiPRYMDb4fBB0SfigNATW9A2Z0CsH0a391mLngaljgzZdtPOjJYvrVTfP0+ZX+JeGDbM/QFO9z1eSPtZdJXNdB2Nk7z9Ln6T6ntjya8ULrYbU3sGQBEqmlT52/Trpe/bSBjtfdd5oFLExVVLzRXfSY+32iDUroVC7zxS9UI5XactcMDxDpqy4fRlKBuh1NllWz/GXH1iZXEHB6C25SoSvQg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.rd index 32623286..300d576b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.rd @@ -1,14 +1,14 @@ { "PageType": 0, "ColumnCount": 22, - "RowCount": 8, + "RowCount": 11, "Formulas": { "1,21": "IF(折叠任务反馈,上箭头,下箭头)" }, "CustomNames": [ { "Name": "折叠任务反馈", - "Formula": "'任务-反馈'!$S$8" + "Formula": "'任务-反馈'!$S$11" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 09581902..273c8d8f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -267,13 +267,11 @@ "12,1": "工时数", "16,1": "特定时薪", "20,1": "工作进展", - "20,13": "从Gitee分析", "27,1": "取消", "27,14": "提交" }, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1", - "20,13": "IF(仓库ID=\"\",\"从Gitee获取记录\",\"从\"&分支名称&\"分支拉取记录\")" + "29,5": "DATEDIF(F30,N30,\"d\")+1" }, "AttachInfos": { "2,1": { @@ -570,7 +568,7 @@ ] } ], - "ID": "1cbc3ef7-5807-46eb-84de-7841d420f99b" + "ID": "d26c7050-9d45-4879-8b57-3fb7ddb5fb56" } ] } @@ -643,211 +641,546 @@ "InputMessage": "留空则系统按照项目设置自动计算，除非你针对此次报工有特殊调整" } }, - "20,13": { + "20,17": { "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B11" + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "=新增报工!R21" }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "版本", - "GUID": "c9cb6b63-e8c1-4be4-ad93-b2c246a02403", - "RelationBinding": { - "RelatedTable": "项目版本", - "RelatedColumn": "ID", - "DisplayColumn": "仓库ID" - } - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "ID", - "GUID": "18f33063-3dca-4746-8af3-7ed6ec586f98" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B32" - } - } - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目版本详情", - "LoadBindingDataOption": 1 - } - ], - "ID": "1f45f090-e7e9-4c3f-9e6e-84dcb829581e" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "user", - "ParameterValue": "%CurrentUser%", - "ID": "72f5e61af6c047348aa4600baffa11e7" - }, - { - "$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": "=新增报工!分支名称" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!user" - } - }, - { - "$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": "1" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "提交信息", - "ResultTo": { - "SerializeProperty": "=新增报工!工作进展" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=code" - } - ] - }, - "value": "0", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" } - } - ], - "ID": "7ea8b19c-20e6-4238-891a-431aee2ecb22" - } - ] - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" - }, - "Title": "加载中" - } - ], - "ID": "b206260a-637b-441d-be61-eb50663b8c19" + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "从Gitee导入" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B11" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "c9cb6b63-e8c1-4be4-ad93-b2c246a02403", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "仓库ID" + } + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "18f33063-3dca-4746-8af3-7ed6ec586f98" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B32" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目版本详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "45d3235b-c61b-4687-8fba-5d4760cf8784" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "user", + "ParameterValue": "%CurrentUser%", + "ID": "a578339d9674437eb7301ba38d58d5d5" + }, + { + "$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": "=新增报工!分支名称" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!user" + } + }, + { + "$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": "1" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "提交信息", + "ResultTo": { + "SerializeProperty": "GItee提交信息" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增报工!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "现有内容", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "ID": "da946dc1d1ce457cb0b6e5bc9cd62213" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "生成进展内容", + "ID": "11744f7dde9d4e939301529c3b430a2b" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var olddata = Forguncy.CommandHelper.getVariableValue(\"现有内容\");\r\nvar datalist = Forguncy.CommandHelper.getVariableValue(\"GItee提交信息\")\r\ndatalist = datalist ? datalist.split('\\n') : [];\r\n\r\nvar oldList = olddata ? olddata.split('\\n').map(item => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n}) : [];\r\n\r\nvar newList = datalist.map((item, index) => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n});\r\n\r\nfullList = oldList.concat(newList);\r\nfullList = [...new Set(fullList)];\r\nvar content = fullList.map((item, index) => {\r\n // 检查每个item的最后一个字符是否为\";\" \r\n if (!item.endsWith(\";\") && !item.endsWith(\"；\")) {\r\n item += \"；\";\r\n }\r\n // 如果是最后一个元素，用\".\"替换最后的\";\" \r\n if (index === fullList.length - 1) {\r\n item = item.slice(0, -1) + \"。\";\r\n }\r\n return `${index + 1}. ${item}`;\r\n}).join('\\n');\r\nForguncy.CommandHelper.setVariableValue(\"生成进展内容\", content);\r\n", + "ID": "bdbc6dd65a5842ff9f2823956f74a539" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!生成进展内容" + } + } + ] + } + ], + "ID": "d0a2286a-48ac-4939-ae79-fd7c56ec149e" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + } + ], + "ID": "fe83089e-5f1a-4374-8404-b0d444c401da" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Title": "加载中" + } + ], + "ID": "1bdbb513-30b5-4a92-8454-e88bd79a2898" + } + ] + } + ], + "ID": "721eb0dc-5d1e-41d4-82c6-9f7236759979" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "从反馈导入" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "现有内容", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "ID": "d74cc36cac77465580872d5d7d3049c2" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "反馈列表", + "TableValue": { + "TableName": "需求反馈登记表", + "BindingInfos": [ + { + "GUID": "efa3bcdd-f79c-4c07-b1c5-2ca56670239c", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "标题", + "GUID": "1bfce2df-7dc1-4b88-b5f0-453820754c5d" + }, + "ColumnName": "标题" + }, + { + "GUID": "a55a6a52-cca0-4595-9ac1-dfa6a2310259", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "提交人", + "GUID": "ada8c449-a54c-440c-91d7-2cff170f743d" + }, + "ColumnName": "提交人" + }, + { + "GUID": "c29b04c1-ce14-4380-b100-d2dfcc4e104c", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "反馈类型", + "GUID": "c3a2739a-1a88-480f-9d60-c2ec7189f679", + "RelationBinding": { + "RelatedTable": "反馈类型表", + "RelatedColumn": "ID", + "DisplayColumn": "反馈类型" + } + }, + "ColumnName": "反馈类型" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "95d973a1-5a96-4103-a8c2-8e15430c8a8d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!选中反馈ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 4, + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "297271a0-2fd0-431b-8bb4-379febe51076" + }, + "Value": "4" + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "开始处理时间", + "GUID": "75e1a034-722b-4bc6-a2e6-ba6bffd778eb" + }, + "Order": 0 + } + ] + } + }, + "ID": "972f3d2fc2124868a5a61e54d4def107" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=反馈列表.Count" + } + ] + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "生成进展内容", + "ID": "0d2b8894db7742bb8a9036e9f92c737f" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var olddata = Forguncy.CommandHelper.getVariableValue(\"现有内容\");\r\nvar datalist = Forguncy.CommandHelper.getVariableValue(\"反馈列表\");\r\n\r\nvar oldList = olddata?olddata.split('\\n').map(item => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n}):[];\r\n\r\nvar newList = datalist.map((item, index) => {\r\n return `处理来自[${item[\"提交人\"]}]提交的关于“${item[\"标题\"]}”的${item[\"反馈类型\"]}`\r\n});\r\n\r\nfullList = oldList.concat(newList);\r\nfullList = [...new Set(fullList)];\r\nvar content = fullList.map((item, index) => { \r\n // 检查每个item的最后一个字符是否为\";\" \r\n if (!item.endsWith(\";\") && !item.endsWith(\"；\")) { \r\n item += \"；\"; \r\n } \r\n // 如果是最后一个元素，用\".\"替换最后的\";\" \r\n if (index === fullList.length - 1) { \r\n item = item.slice(0, -1) + \"。\"; \r\n } \r\n return `${index + 1}. ${item}`; \r\n}).join('\\n'); \r\nForguncy.CommandHelper.setVariableValue(\"生成进展内容\", content);\r\n", + "ID": "9c7a3914669449d9a611727bbc3cccd4" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!生成进展内容" + } + } + ] + } + ], + "ID": "d1736440-0257-428b-8d15-9e2745a1801e" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "无反馈内容" + } + ], + "ID": "334ddb79-3459-480d-8f3a-0c09770b716c" + } + ] + } + ], + "ID": "cb4c1f98-0114-4f2e-985e-c8cff63943d7" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选中反馈ID": "选中反馈ID" + } + }, + "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": "=新增报工!任务ID" + }, + "TargetCell": { + "SerializeProperty": "=导入反馈!任务ID" + } + }, + { + "Source": "1", + "TargetCell": { + "SerializeProperty": "=导入反馈!最小状态" + } + }, + { + "Source": "3", + "TargetCell": { + "SerializeProperty": "=导入反馈!最大状态" + } + } + ] + } + ], + "ID": "3cbecff1-1e22-43a5-89fd-d4867fbf5eb6" + } + ] + } + ], + "ID": "be36ad1c-d5b0-48f9-a3f2-fd338c1cc013" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" } - ] + }, + "PageName": "导入工时内容菜单" } ], - "Text": "从Gitee分析", - "TemplateKey": "Gost", - "Icon": { - "Name": "gitee.svg" - }, - "IconSize": 14.0 - }, - "RulesGuidList": [ - "bd4478c9-d394-4be8-b601-d18f68a38429" - ] + "ToolTip": "导入数据", + "Size": 18, + "ImagePath": "Application/008_add_file_3.svg", + "BuiltIn": true, + "UseCellForeColor": true + } }, "22,1": { "CellType": { @@ -874,7 +1207,10 @@ } ], "type": "textarea", - "placeholder": "请输入", + "placeholder": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"请使用序号+小数点来说明工作内容，例如：\"&CHAR(10)&\"1.xxxxx\"&CHAR(10)&\"2.xxx\"" + }, "resize": "vertical" } }, @@ -1156,7 +1492,7 @@ "ReloadData": true } ], - "ID": "78368f13-c76f-4017-818a-7284774803ea" + "ID": "64aff9ed-dc78-48a6-8bfb-fbfc16a032de" }, { "CommandList": [ @@ -1171,12 +1507,12 @@ "BtnText": "知道了" } ], - "ID": "7c406259-22f0-4dc8-99aa-876b16831354" + "ID": "ab5ec2a7-5fb4-4119-bab0-b0075d8140db" } ] } ], - "ID": "b2f588cf-9f02-4daa-89fa-51b63d52ed80" + "ID": "6a727c2d-5955-410d-8131-f656b9881837" } ] } @@ -1262,7 +1598,7 @@ ] } ], - "ID": "6b1382c7-28eb-4888-a48a-4437f52c6e32" + "ID": "56dce70b-dbae-4606-8959-38de5a637d29" }, { "CommandList": [ @@ -1277,7 +1613,7 @@ "BtnText": "知道了" } ], - "ID": "037ec484-9cf0-40be-9b7e-cf10836f0347" + "ID": "b07cb55d-3c22-49c7-a6cd-da85cebc4a72" } ] } @@ -1364,13 +1700,19 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, + "Foreground": 6, "Formatter": 1 }, { "BorderBottom": 0 }, { - "Background": 7, + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "Background": 8, "FontFamily": 2, "FontSize": 13.333333333333332 }, @@ -1386,12 +1728,13 @@ "Background 1 -50", "#FFFF0000", "Right", + "Text 1 35", "Background 2 -10", "#FFFFFF00" ], "Borders": [ { - "Color": 6 + "Color": 7 } ] }, @@ -1567,7 +1910,7 @@ "20,10": 1, "20,11": 1, "20,12": 1, - "20,13": 6, + "20,17": 6, "20,18": 1, "21,0": 1, "21,1": 1, @@ -1625,13 +1968,13 @@ "25,15": 7, "25,16": 7, "25,17": 7, - "27,1": 6, + "27,1": 8, "27,2": 1, "27,3": 1, "27,14": 1, - "29,5": 8, + "29,5": 9, "29,12": 1, - "29,13": 9 + "29,13": 10 }, "SheetStyle": { "FontFamily": 2, @@ -1652,7 +1995,6 @@ "30,1,1,3", "30,4,1,3", "31,1,1,3", - "20,13,1,5", "2,1,1,17", "29,1,1,4" ], @@ -1689,7 +2031,7 @@ ] } ], - "ID": "c94b98b7-79e0-479b-a449-52200ca0673b" + "ID": "bab1ff5d-c75f-4eca-9d0e-ab27578b9a12" }, { "CommandList": [ @@ -1706,7 +2048,7 @@ ] } ], - "ID": "d39b59bb-8e3b-4315-8403-888d28c58d0d" + "ID": "530201fa-f031-43f1-8ec0-551e15728ebc" } ] } @@ -1729,23 +2071,7 @@ "RepeatRangeSettings": [], "RelatedDataTableName": "任务平行视图", "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(ISBLANK(新增报工!版本ID),ISBLANK(新增报工!分支名称))" - }, - "GUID": "bd4478c9-d394-4be8-b601-d18f68a38429", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": true, - "IsReadOnly": false - } - ] + "Rules": [] } }, "PrintInfo": { @@ -1794,4 +2120,4 @@ "Formula": "新增报工!$B$30" } ] -}//udWlRG5tDz8T7owlZI/M6nwYLnFijtqEdZ10iM0ocEK+vS5RaWj6O0Q3XczdIrax4Quy3EQpo+I7UpyBw1FDrTpKslGXEIYOAA/Y42HI6kJwHEJrViECljbQU5ya6f61x6WzZHh3Ce8wh9VXfR2Tzs3IQJ7YJ3UaqCuaU1u/sCOZtPTk8Bwpsi1D1Wzo2ZovtFDoUR8rBax5Gb2+bNL4zlK+v4WBFMlXl76j7cQFjQAIwWzmoG6UCNNfkzqpfgNIP6zOCh+HEwLtk2PfWEO2Es97QYm3Cun/Qx6GAzSXBa8hqg3YdjEAU7gMs8PpT11tIvjBSxa/ZQ2IS3zyH8kvAnw/8c9rPzU+jM1dytLnYo6XX0mB+ReZvox6pwg3sxeStOz23dFqeaj25uqOcqrSRPr6bOhegMjvvOfrwUqhB38tgBvKSyHc16UDxmPEoGIgxoIEnHeojqi92ABupdohu5lnPqWmP8AZmKZc/wdXxaJLL/vqOBXqYjK8bP/wizwwms4GRkGx1xhO0TyTAlGsWaHRgXrf6fDhhTv9eY0ACHf9SJVxJ5qaBlJ2R4+n/Vd9IhiVnudwyRN9vcTyUPTrhE7RpJpslk36/9p2n378b5+gIrTaFcfTFtLk+Ql5ifUHNaa9fDFouM+Qk1pWTf9m42yWlC/NtBuaKY/pe4l2gPsublQkjhM4ZHUQjGhqKPpT/s9a31jcaeIpptH767dDMHusTUoXXpgp9gCZ9Rl4Ehfrjvi3eBgRWc1h8ZvqY1Re2aBRYTE/jLRVu1z9++OfGaiqFKoQcSKSxIVSZJrBtPHUhMy8mt5koNNBbomidV9MufAlVO/muu67FWGRDgGq/d8oHw7jhpJAv8nuydhfRn69oew6Nv/oBXugJnlciUNtx5WVAI9PVgbZO+kH/ifHaQ==|920 \ No newline at end of file +}//zpEB2CFaSTO68K7kY1BsyvpSDvRh0GlEP2nRUDexMPQkFVukmkoF6XJuxVjLHprsGzxTlaVZqfHGHA30B7wg3z2UmVX5d09uSE5DvZ7f0yZPZKCnRxroMreqM9sJgKm7ajWbRlC9pHzO1FQqkIW3QCsFDoQPd59cmBl5cJg5+ZG9Vh9PYM3p3HneIHuSm15gukNNeQ7Yfr+s/c2FTbCSBFa9UCqt3rvLxbXnZ7+TWmBcodYOuPv+mgBYjzFwq5gc8bxmA6ckZ/8RpuY0kS0G80Z1XadyFFT9Lpp421NeIKfrGT6OMlmo4ofZq884Wcs8ZXpWeS0lzWWVAUnPIGIEPY5VHBaVJqKA0eJJrQUTYmGvlGqvMnW99qrASEOXyoX6rXGp81fewcvo9jM+nQEMTdPzCgrWBdMwu6SVeAAZ5YyaupRetNT32qKHAQ4M6o7b3lrRIkrYfZ+qbUMS++9QaFYCkHXtQRz5007y76+ZlFZtsikQ/1uSJ9YuBpSd4TBddzmPyNPd9OUAAbkEluASuiy/htu2VAdIpi2lB0JTCXUVPL4ocLmtP1tjTY1ZPclgedcWwb/DFP8IeNpHfhiC+UDpx4UrZQbrMPAKEdOZg7GHj5Wsum1ZH55dUBIxOtGDW6iSh94h0jCXiSBMaq93JZjZiMN10eEEwRDpBJO7RrChAFNqTPogckzwWtHZyF50EDJvXr9AbCktDdgp8pOVKCNNr4jGNeksMpl0kOeQv5TDmXleIazOx03c0NqRDQ/qSs5gHS05F8HtrwoQ2yg0/60b0DlA0U9L8LLwctKs5oPcbB7COyz40rc/wfrniqiM77w6DYFC+1M0T36enyglVgg0RokXMcU7Vvc0YGEQUrxuImxhtdSkkRWbbsLflO4sx6D8+fzIoUmyGvu6KMDhQQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd index a5205e20..5a4aa45c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd @@ -3,8 +3,7 @@ "ColumnCount": 19, "RowCount": 32, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1", - "20,13": "IF(仓库ID=\"\",\"从Gitee获取记录\",\"从\"&分支名称&\"分支拉取记录\")" + "29,5": "DATEDIF(F30,N30,\"d\")+1" }, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 794dc90b..43c1071b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -552,44 +552,6 @@ } ], "LoadBindingDataOption": 2 - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 4, - "ShowDrawerHeader": true, - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目反馈!B4" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ResetTable", - "ParameterValues": { - "clearSort": true, - "clearFilter": true - } - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "PageName": "反馈与建议", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目反馈!项目ID" - }, - "TargetCell": { - "SerializeProperty": "=反馈与建议!项目ID" - } - } - ], - "Disabled": true } ], "Text": "新增反馈", @@ -687,15 +649,6 @@ }, "ColumnName": "标题" }, - { - "GUID": "2f13d281-7418-4d4e-9dab-0ff5f44efa1a", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "1f42babb-b32c-44e7-891c-caefdb8739e2" - }, - "ColumnName": "功能" - }, { "GUID": "63241758-6814-4b01-88eb-590c3c8ba841", "BindingInfo": { @@ -820,19 +773,6 @@ "SerializeProperty": "=项目反馈!B2" } }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 6, - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "32699db2-ba7f-4ba8-9027-56ed34dd49d7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目反馈!B2" - } - }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 6, @@ -986,27 +926,6 @@ } ] }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "功能", - "label": "功能", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "9f1456b4-ee8e-4d42-a846-d702bbb1ead9", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "提交人", @@ -1366,4 +1285,4 @@ "PaperSize": {}, "Margin": {} } -}//zjc6XdvUUHeokCj+IJuYXuMCEgdLhXEWMz0mf5+qQF0ih69uRwAdKYBhfXxF6zAmQTWvowvpyMfP/g/C6GFPpI4PS0v3slGSDNwJTyewawqhOsDKsfu1DO6qUqdbF5irk+pq9Ayi5/0/34axa+8UMN2v1WSBtfAAMmqlMw+/Q599xzE6gZWTSX3LKeRdihwTZzz8clNP3eG+zPqKjymZ5iDC7GgBCN3G+y46jsEL9hq/zefOUHHngV6pO4qM+gwM549CNL5tvJUs4/rv+XNxZE99DuKhpG1LaBqNPSPgeBDI5QcD6x097Q9OogH7IAyJaQS78pFHe3ORCVlHFFbRE+KO5gZOzTmAItfgJSAj3ePtq5yST3HCQVpC6XoNRJytZ/k7A7CXY5HKivGenlg74axiaUr+e948/WTdbBL2i17VxkgNzjScqIbADyNgCxWXrEgDSNOkMzuTrt+zc1XLexMPjjBYkwn0RiNd3gPmQ09JTGzPZGFfk1OdVDKZIkow1WOiFtPWfJX2qt/cvhrOAQwoqmiENQpQxrp7jZi2Q1jQj0+KGOuw5BsoBXCy+AxX/7erW72KwMKLITkjpE5f33AAYe5zXUZkzei2LiSYhTJS/B7GtCuSWNMZ3RYsr4F+YDTSHfRZrVXBLk/lxQgDLETqc4tyLHW+LSREqc7+u0j+B2r0XRARwVqlKURyJfwVjshtP189QQtQBL1vIU6KypMzc0ttpm/ubGiQdFvrfSUoDnmK8oG7flDLjLX78K+pzwgfwlXygsKdQWwLVwl2rEPBu6iWoDDJN2+CBXxYfrPpWBgqKoYEamMNA373G6y4idBYek9ZxyX2pveoMNcP/5by5NLMHf7pnAUIFdF9rwnzp50OdiLNTVkPKc0KBxh5poe9a3RjB6smIG9D4IUjpw==|920 \ No newline at end of file +}//gEPwsmnyWY1qT0SkfvXaPVNZi2N7rYT1W7G4DlsR96cqrLTV39V46ccHdGx4bNkL7VoQEZUhHJ7psQhs/ijlZNGVYtNYnqWF3/LZ/6sMtaKkZxZdjnymmKas0qNT2X9TKCBV35QWsv7WROXpZG291A0v7RsWI6mhQn+YwwgcABtJqbT0zvNoGc3cKfJGurUgLwsE3/NlgUmtJtGi11sLLyUNO5qsp4ne7BBExvzTKbLpVmdBQhckPZAxzjeGDcjxkUSbWa5VQdkRQCXCeYywxuZpV/x68nCwEUMFc9ZGYUPmqprnrt3tkRkBkberrSPgm/4jo31a+245cBiRHOXpvssFjf3Tq39wGne289O373AOjFsX9Qn6I80/3P0LBfHZVC+Vl+KY6a1TVZh72OyrNtunLKpLedvHy3l2c3n3OYEopKhlpc/mlk+mw+5WMT/y0SWl4YOhdKwHA9UjvCookBI4TEkA7yCO/jCYcVON9bOUcnGTEUJPpYX/9tF++w5FCOj80a2WMhHk2uKQz7tccbFGHmx9+pFwghDKYGflTQOEAD5xHeJnf3DKXwG4ZWywFVaPs4iK2V6IerDf26a4UXT1NlUuO1skcQhgfRmdVApjOSvGhuuBRI6mvIhgleUXPrl+8707qljb8FSIpc8bIKYNohZW4pDut9+By4+EPWtoivVvSzFrFmJC7JXLANgUO+AvRWgHmee7pYG8nw6uOn4XPdUrSIerthiBxP9H1Lr7W0uLJEm0715vkdlb2IWgpDSvERfOSRmbS3c9XuSxNCPHchne/8nbKAOJyF+hteefTnimq2eewYJQFqhKx/pbEUok2XWUQFYlmh6ERpv351Z2YPOQvcO6Jv2hRP1zn47Y21KM9sy6I6O0ZVlCkJgVz44N3nNWoZWWUqX2MC0SSg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json index 19e63730..86c14f7c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json @@ -190,7 +190,9 @@ "DefaultSize": 32.0 }, "Values": { - "1,34": "导入选中反馈" + "1,34": "导入选中反馈", + "6,18": 3, + "6,21": 3 }, "Formulas": { "6,4": "ODATA(\"项目表?$select=项目名称&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\")", @@ -257,7 +259,7 @@ ] } ], - "ID": "f808af38-b649-420f-9413-286132d2c835" + "ID": "dbc3adbc-ed7b-48fa-b682-fcf114410b26" }, { "CommandList": [ @@ -266,7 +268,7 @@ "ClosePopupResult": 1 } ], - "ID": "96d68463-8c54-4f04-aa45-773bd7c67ec6" + "ID": "3bea74a4-251f-4370-b43a-1335845d5cb3" } ] } @@ -343,15 +345,6 @@ }, "ColumnName": "标题" }, - { - "GUID": "92fcfc2b-3302-44c6-8073-81729f84c1f8", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "f25bc6e9-5222-4245-a6cd-23718f384de1" - }, - "ColumnName": "功能" - }, { "GUID": "abd906d5-dcfe-44b1-a208-cb63c2f25824", "BindingInfo": { @@ -404,15 +397,6 @@ "SerializeProperty": "=导入反馈!项目ID" } }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "状态", - "GUID": "bc636b2d-4923-458f-9d52-831b3d927d67" - }, - "Value": "3" - }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { @@ -429,6 +413,44 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=导入反馈!版本ID" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "关联任务", + "GUID": "e332fa35-779b-4c09-a723-24dec2012dfb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入反馈!任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "bc636b2d-4923-458f-9d52-831b3d927d67" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入反馈!最小状态" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "fb93bdcf-e450-4eae-80d0-79e89860500f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入反馈!最大状态" + } } ] }, @@ -556,27 +578,6 @@ } ] }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "功能", - "label": "功能", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "a363475a-aa0d-433a-9c20-7199e9c21ac0", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "内容", @@ -786,7 +787,10 @@ "4,1,1,37", "6,4,1,6", "1,34,1,4", - "6,10,1,4" + "6,10,1,4", + "6,14,1,4", + "6,18,1,3", + "6,21,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -823,6 +827,18 @@ { "Name": "版本ID", "Formula": "导入反馈!$K$7" + }, + { + "Name": "任务ID", + "Formula": "导入反馈!$O$7" + }, + { + "Name": "最小状态", + "Formula": "导入反馈!$S$7" + }, + { + "Name": "最大状态", + "Formula": "导入反馈!$V$7" } ] -}//qcpIGTulljYSk/jSx2+f4EhlNCnZpomiZKiTqZ41v3NJbyqgWBpDIKyrVGqM0SN4ASYWEKloY0PSvdBQsAMxqO5BySVJmTHy0wfdxPMCsxrgxzZfpHcQniXOBy6h/APHzg8iPF19xuQkjH0cj2iMzuOKTuc7fc26YkQELyercb/rUQekdU0dat0Q1ftqD++ZYwmPZp0goU+fvO7s3I/wpyj3SWNn/q0EMEE53VQ7Flk+u8FRmStJjJL/KcXVaXybVBs/rDOHj3fGYpcYqoOIJa4WZWQSHbTSLVTdWEDmnZawp9mQw0qrBd7nu+KfTNDk9ydMD5CxhcR96eUYkqBm3zf7knD6TKL+mxFFU+akEszuOa0HVoZVSZXDou9+XSuqZiMW90fi2H7KdcPEz+sx14gxgGseUUYDDx5Btt6iAldYiilEbxLjUt8mwJm0liH0IUhmDzk/vxfrVZLL85g9cfNv17zbTl8dIFP/SJQzkfVP+UCi5JLncFig1JxBiU8xlZwkBfIKBsMG/AemNeMlGBVfcq9vHNtUdPm1uNwFqzowzZ49GzFefxVliUlUh2nHajaMf4g1U9MzpNe9iGJ/38UsfUYW9f41V/seIxAnaGADf5h3g0hxpZYIho5AjKxqWTsv1Wq+NEQBN42CIUFUOzwFUJB3xYa7N7IoJmVoGuZr/nZMtpiTwY++10Cf2qPfHXGJx+sng8jBfoqwzeWv5qZTuxtMZ0yj7u3QMsmDJHhDLO/j5ghdxlDR0hreWbj1HYJ9Qmnyd9bGZZ2qfFMEb733dI5d8qNNyv6SHmNw1UIHRCWTyTNK2h4XPlqbKGsdCPvVk1iLZ1u30iWoCGmFigRaq/Wc35Ne4Gd+KDGIexIpXKpPPBZbScn/XXC05QccCM7LHV9oe0nzWuCX3yb5bA==|920 \ No newline at end of file +}//YVwqyOofdDLvH8ccobD7kQsrcj9hJU6a2q/P3KsZe9Ot6dVlzYcT3wD/FXsF4+IS5NUoASfzfsg62xZoGcUWH+tGTbWjYtdb2VsiDDs5CSeQ41NtJlhD1S95BEaHZ4aTkUOqQLTlDIJH8ZCWk+/zmsjFtE7AKaUnMsK1F6pNOR/S+UO7NqvvQ8qU2duO6t+hLeNit7KwLDUMDSnmYPrtoDM/97OkyXWko+JdB/YB3Y4KSagsyGfFMpQJ+1ZTEq7/cPN/JjWb9L2bVlJb4rVxbSy9w224MvHag1cF8QGgKybOr86cdDZRMlvhDUNk4mf8JwdkaMgh0sxxjTP4a7uji+XsxjQLf6o0BdkvONkp2Y3GpAR0HsyeTQJBnQ1PScTm3EiQvil9PLROXvveznzfW1GmiSyDGX+MI0b/5QSfL5om13t26ECIsAAy+L0xk333kEF8uUDJo1Q8ZVsb32Q9WqAxGY2ulWpG4Ggrn3myUMEE1T1oPd+mxXq70xEIXd07y50bA3raAPmQhYseLu6dmeOp67TefOWY7hwlNIJPpr/shORUGqZSjyTAxKQdeSMUIZcwc8ZdDin+l0VZtUFl5rt7Z0WnwSgYvzDgS6syl8c9pWBENGkbQAXBVADpvqvWhHtPH+8i7S3jL22/up6GrIufF8v7Nswq0Bqn1fbpzwpuLAf4sw7cbW/3Lr8tb5qHyDg34Uq3DTFxbHVmf4Ev2RvDITUzR5RUS9ZB3GKcKnRMscRLWvbQFw8dTebZI8xISUzOlGuN74iKwS2iwjP6HpaGnOkay+L2177Tu91DBwUPpNfR/fk319+qfteQyxuHIf3rujZzuw+7K6pittpanAcc687B3jeXYiWw9r1kJs6gnB82338ITXH1sSYYKrv+zlHL0XXRaib9CEkYmBtUvg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd index 6d2de8a8..be396b80 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd @@ -18,6 +18,18 @@ { "Name": "版本ID", "Formula": "导入反馈!$K$7" + }, + { + "Name": "任务ID", + "Formula": "导入反馈!$O$7" + }, + { + "Name": "最小状态", + "Formula": "导入反馈!$S$7" + }, + { + "Name": "最大状态", + "Formula": "导入反馈!$V$7" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json index 0034f2e6..4cd09e00 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json @@ -703,9 +703,49 @@ } } ] + }, + { + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "温馨提示", + "Message": "是否为您生成发布内容？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "确认" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!AI12" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.5.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + } + ], + "ID": "b307d2de-6df1-4d09-9186-9da70d9adae2" + } + ] } ], - "ID": "478fa1a4-2526-4611-af67-941fef5f9fd3" + "ID": "6e9ca147-ac47-4b05-b364-57538dc617ee" }, { "CommandList": [ @@ -723,7 +763,7 @@ } } ], - "ID": "b7c4c516-0c51-42bc-93f6-85937b50080c" + "ID": "09022e3d-c3d1-407d-8ded-13f0962d3ae4" } ] } @@ -756,7 +796,7 @@ ] } ], - "ID": "a7386d5d-5aa2-4a2e-aaa3-a39b6c017ebc" + "ID": "06ca62a3-e0cc-41f3-bfc3-49685e63ac2e" }, { "CommandList": [ @@ -770,7 +810,7 @@ "MethodName": "Focus" } ], - "ID": "be8290a3-fd5e-44fc-9602-979c37c40907" + "ID": "8f074400-dd83-4ed8-a824-294ca73d39c1" } ] } @@ -839,24 +879,6 @@ }, "ColumnName": "反馈类型" }, - { - "GUID": "0c8b4d6a-8e82-4d98-8809-f94842860d31", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "标题", - "GUID": "5fd5b2e4-1840-4b75-89b3-e6fd9d8147bd" - }, - "ColumnName": "标题" - }, - { - "GUID": "dbe0f9cd-cdfe-4de2-a568-665c992f8348", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "566cecfa-4b17-4d7f-90a2-f221336f31b8" - }, - "ColumnName": "功能" - }, { "GUID": "1ef1af72-086a-4096-a672-d069cd9ff504", "BindingInfo": { @@ -1035,27 +1057,6 @@ } ] }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "功能", - "label": "功能", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "92a1d935-ec5b-443d-978d-388bb4d90667", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "内容", @@ -1224,10 +1225,18 @@ "compareType": 2 }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!B14" + }, + "Title": "加载中" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "生成内容", - "ID": "fe804635779343db9e19cff12197be45" + "ID": "6a684da2c4be41bab538fab36abb14d0" }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", @@ -1250,7 +1259,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=版本发布详情!R6" }, - "ID": "aae4c031702e46fba13b1da44bb18a3d" + "ID": "96997adea9674450ba50b551ae3330fa" }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", @@ -1271,9 +1280,18 @@ } } ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!B14" + }, + "Title": "加载中" } ], - "ID": "c31d8765-62a0-4935-842d-b527b6fbe6da" + "ID": "ec71b9f9-e3ef-4b91-91f3-b67a8ec647c6" }, { "CommandList": [ @@ -1283,7 +1301,7 @@ "Message": "请先导入客户反馈" } ], - "ID": "1554134d-b36a-4605-bf23-a5605243e770" + "ID": "a7e76ab2-e49e-462e-a0f6-727e1877f67a" } ] } @@ -1357,7 +1375,7 @@ "ReloadData": true } ], - "ID": "8ea9311f-2ece-4986-9dad-dc292c6a26eb" + "ID": "5884499a-7c31-4827-ae0b-811664e896ac" } ] } @@ -1489,7 +1507,7 @@ "ReloadData": true } ], - "ID": "6bf988e0-089d-4c7f-9484-4d767d54b13b" + "ID": "ebbeab5e-933f-4801-8b77-d2bc72da44be" }, { "CommandList": [ @@ -1504,12 +1522,12 @@ "BtnText": "知道了" } ], - "ID": "1e432ce3-ba44-4b8a-8972-54dffae4aced" + "ID": "5bf0fa4f-0770-48b0-bebe-b52cb322354a" } ] } ], - "ID": "d2947594-c4a6-460e-8157-987ea467149d" + "ID": "b329735b-39a7-41ca-a1c5-24dbbd37c963" }, { "CommandList": [ @@ -1527,7 +1545,7 @@ "ReloadData": true } ], - "ID": "ed63c9e9-b292-4bc7-b212-d3eeae2236eb" + "ID": "71451a83-0fd7-41eb-8eb1-3ed60d4601fe" } ] } @@ -1957,4 +1975,4 @@ "Formula": "版本发布详情!$N$18" } ] -}//BLSVBkDg42+InSdk6a5+89RQnauD6HgedUnkCeLn2AUfH8Znw59eTGNZMVGcgAAhI3JQ76z0b0VVlE+C0pTNQjimJIc62IkPOIt7pnzJFL4VnIB0f2PLVY7/F9jbPDsACYiSuRgOvaZygGe5r8ehq1znJzxWIPURkGkcpALkzSy84r4gpDpGQ7ngIO0s+XcPa07w5JxDW/AeSMwsC2DM7CCMh9gRRiOAv2G3786h99dxrJF4ZrlnTserNVUPeTdKCeEovQkQSm3r2jtiL708D98sKVJusqUCMmyZrH1cjQDLdga+paH5jCihta4+1Wq2noWT2bzTyIzxQGbFkJJeZ2roiiTsEFUa6rM3zKBBGuZTwudfmioUFf4rJKdXr6KSNaaJzpl6YUrauRovBvlbSDxPgdE9pHCkapcwOrAxR/KX+Lg92YARWz/9o7sjwxUVkYvWrbm0zh/CqN22Al44DyGkfq8y4BDPzRRXTsjlYILOT9WSK+5PsouX7T2hftKzGvC8nf7RfsOXxaRBhjs17+QHvflV2xzVUFSGis2xeFqlhzQOuNODWMDyAXsxHmmOd15Af7KLcl7UGF9BfIX8Z09FSZYp5chkL7pwPWw+uivtPNfoDW49aHZ2yYQK+3nwaTNXIs2CI+mIOfEEZmdhFBi1RmFcfv6OrkHXsAD5d8DYJWmH8xxHbMB/xsfPxvZ49dzxQ0NgP0nfefdJ58I3c8BkEmC4E3CDhPbrLH+O2tvjiWjh34AegtEpVBgaj6FzKXyCkjzYROjGAdrvx657CygEnz0sK1FXiUBdKHqhmuk7B2cXauuGc6wN09kpPOss2JyAUSa/b7j+agfs7xllt6vPW5tHvkXtC6b9FH8RUGztbCdh7zbXDuTZZwEZWnvyuI+FS34a3o4uUvj97XO/xw==|920 \ No newline at end of file +}//XkeVcUv6QZUxbxSFE5bXjbSEDeyVaAy49Z62JZeFFVFhte55hlON82r8Uhu0a0rYlYnz9gm3wvYui5kkBYHuzDBcVIOi1qyyvrGyHosuFpLU5y2135R3F0WpcMbw2Aagsi4XXR5pHOp+aztvdgcTTyC0uPtVFZgyhjl086tzWHnYQ+FIx5Xe5SoQ1AAh/auntxYHx0VbYPu+C7qvShqKyLcX2j23z60Y97ViBOPhQYYgCeb4k+ayZJS/ZbbMa0+kw647j/uz2SHpafYDYniQXz2jlAIKhKCSjrP0HpweLHbEmF/hRgEaamFW5cX4D+kHSvJpi5fa6StovWOWubHG+u4GSzX6uEvJtFt7LViMh5NXopyng8+ubc5P03wuMn/fOc/P4L3j7VG42U58EP5L6He7M+OdYGBraRHyXwmuv94jdc9u1XTyfDxuZUkQIjcYh965ObO/KJs1wyrViG/heitQUVAlYm+diHn/dl9rprk70PyTZrjsCcRBa/I+8Ok/3/xU2fezGVIbNtYMVFWK15YnEFHoXPiEdBadol4KWyfnBdJICnXLczJBBo2resvbdO/bw1axODzziDyziRmQFO+A0VJta4yM54WWMq30IeMy9IlpbP5XOTqqoTOP1ZkQYmzEtep0L4OAu/vf/vMAADTHhVGXoZKEGwgYdPF57rgdwOkXCH3amvj1oObfpDzhiH+MGv61u2BpUc7OPdZCv+O9pRoVW5OpGrNPL1mP34vOnlVG0mbLkH+Omp9pLIMIXMGo50XF+0tId8pEIaaE3LnZSXYgeBDcBwiECFOP59m9G6tsMzeiiRmCciDWzCxGlL9vH8wOdYpCXaJVcBhsmcgVoNx/Fu90Nx6dC8u8mxLxjJOSCyH1k2j3CwjEu0SispNvQAV9MzGzh36gDtpM+g==|920 \ No newline at end of file diff --git a/ServerCommands/项目反馈/匿名提交项目反馈.json b/ServerCommands/项目反馈/匿名提交项目反馈.json index 0592840d..8c004dab 100644 --- a/ServerCommands/项目反馈/匿名提交项目反馈.json +++ b/ServerCommands/项目反馈/匿名提交项目反馈.json @@ -37,17 +37,9 @@ "IgnoreBlank": false } }, - { - "Name": "功能", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, { "Name": "标题", - "DataValidationInfo": { - "IgnoreBlank": false - } + "DataValidationInfo": {} }, { "Name": "内容", @@ -105,14 +97,6 @@ "SerializeProperty": "=标题" } }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "功能", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=功能" - } - }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "内容", diff --git a/ServerCommands/项目反馈/后端新增项目反馈.json b/ServerCommands/项目反馈/后端新增项目反馈.json index c722eb58..fe72eee4 100644 --- a/ServerCommands/项目反馈/后端新增项目反馈.json +++ b/ServerCommands/项目反馈/后端新增项目反馈.json @@ -27,12 +27,6 @@ "IgnoreBlank": false } }, - { - "Name": "功能", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, { "Name": "内容", "DataValidationInfo": { @@ -61,7 +55,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "ce362c20-c1ef-4689-aa2e-83441cd4ef50", + "GUID": "00aab768-e1a0-4710-b78f-0d105e2200bd", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -70,7 +64,7 @@ "ColumnName": "项目名称" }, { - "GUID": "8b842fb8-31e3-4017-857e-b9ef48a0436b", + "GUID": "ed7100a5-64b9-4972-9784-7dd9e2507bb0", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -79,7 +73,7 @@ "ColumnName": "项目状态" }, { - "GUID": "675e27bf-42ed-4ccb-bce7-9888c4e2de73", + "GUID": "7a908f6c-ebfa-442c-82f5-279ed3e93c0b", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -88,7 +82,7 @@ "ColumnName": "项目经理" }, { - "GUID": "cfea2e79-3062-4891-9f47-e9e5ac6ec208", + "GUID": "2b622506-11dd-4489-8a28-fa5c2cf60e51", "BindingInfo": { "TableName": "项目表", "ColumnName": "开启反馈收集", @@ -112,7 +106,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "43b38f6aeac7476aa59f776442997b4a" + "ID": "4f329450e3454c82a3f4e885c4df66e7" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -215,7 +209,7 @@ "ID": "65851cf1cc2c4aea8f0bffa89bc51c81" } ], - "ID": "7c9e1197-fa39-4838-97ed-f9f91a3db834" + "ID": "c5fac691-27dd-4495-9b41-69077f34573f" }, { "CommandList": [ @@ -229,7 +223,7 @@ "ID": "241b7726859442948ac5735d8e62f67b" } ], - "ID": "74459173-20fa-46b8-ada7-d795ac43a3f5" + "ID": "20eb0b80-e5db-48e6-9d8e-db1d2308a143" } ] }, @@ -344,7 +338,7 @@ "ID": "109c2c792f3140fcb18391d665ba6466" } ], - "ID": "c612e453-c66e-49ae-b555-981c6b67c2e8" + "ID": "bd5c9496-f4e0-460e-ae77-ad738f25f814" }, { "CommandList": [ @@ -358,7 +352,7 @@ "ID": "c294a5b08553459f94f2a11f8d1ed02c" } ], - "ID": "35c28655-5fbd-4ec6-83fe-9757eb3af4eb" + "ID": "66344fe5-1c54-4923-a301-976254bda5d4" } ] }, @@ -385,7 +379,7 @@ "ID": "299f253110674735a00ec8d2450d5a25" } ], - "ID": "fb43b7b4-a70b-4a61-8d77-70c5e2bac747" + "ID": "7aad0094-c4fd-4409-b881-829b154db026" } ] }, @@ -399,7 +393,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", - "GUID": "c4a7621f-f4b2-4ed4-9a7b-2f2f6985dfa3" + "GUID": "ad4258c3-5a78-4944-99c0-eb5bf2082c60" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -410,7 +404,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "标题", - "GUID": "2700e224-5778-4d2f-b4e2-c8afea2c3cee" + "GUID": "24f36892-13d2-447c-b8f8-d3c8ededa003" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -421,7 +415,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "关联任务", - "GUID": "accbc5de-6f9e-465a-842f-11770f884c71" + "GUID": "a3c10476-3ae8-44d4-aeca-4eb16d38e99c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -432,29 +426,18 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", - "GUID": "6fd4371b-1d2e-4eb4-af62-e642f1903071" + "GUID": "9caead9d-7adb-431d-a32f-cf56e7ee53d0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=反馈类型" } }, - { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "功能", - "GUID": "4399135f-68de-4356-8e9e-8c3fb579c7ff" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=功能" - } - }, { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", - "GUID": "28d26108-9623-40ca-9616-2a3607a0a009" + "GUID": "ab7912d9-e2e4-424e-82b9-0011487553fd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -465,7 +448,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "提交人", - "GUID": "044775b2-b29e-422b-baa0-7f922c495423" + "GUID": "ba627564-f894-4821-b235-08e82d7ed7ef" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -476,7 +459,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "联系方式", - "GUID": "fb21cb0b-4000-40f9-9824-245ac8384174" + "GUID": "8167a720-81a1-47db-a25c-5ba6271864b3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -487,7 +470,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "处理人", - "GUID": "016aef9d-118b-4781-867a-0acfe696fd08" + "GUID": "9ce29dfd-cb43-42b4-a68b-17ffcc10dd6c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -498,7 +481,7 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "状态", - "GUID": "cb4b3bcb-c93d-4543-803c-a74b7593b764" + "GUID": "2662f0d5-9318-4147-886a-95fe05fd326a" }, "Value": "0" } @@ -547,7 +530,7 @@ ] } ], - "ID": "bd8aa459-3dc2-4aa4-abf4-249a50c5ab9c" + "ID": "f0ff0242-7a2c-4baa-87da-665085fe8700" }, { "CommandList": [ @@ -562,7 +545,7 @@ ] } ], - "ID": "0bb8d9bf-8a26-412d-9103-1d73562ee7bf" + "ID": "53e997b3-ac43-4a1b-94f9-8231b813ac19" } ] } diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index 7e95440b..8875d293 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -66,14 +66,6 @@ "Name": "标题", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "DatabaseColumnType": "nvarchar", - "MaxLength": -1, - "Name": "功能", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "Required": true,