From 32badc7cf7ff3af9bd519775b39037ffce4a40f3 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Wed, 6 Mar 2024 13:30:27 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=88=90=E5=91=98=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/=E4=BB=BB=E5=8A=A1=E8=A1=A8"},{"State":1,"Type":23,"Name":"Tab?= =?UTF-8?q?leView/View=5F=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1"},{"State":1,"Type":7,"Name":"Table/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B7=A5=E6=97=B6=E8=A1=A8"},{"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/=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=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=BB=84=E7=BB=87=E7=BA=A7=E5=88=AB=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF=E8=A7=86=E5=9B=BE","?= =?UTF-8?q?ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E7=B1=BB=E5=85=B3=E7=B3=BB=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E8=A7=92=E8=89=B2=E6=8B=A5=E6=9C=89=E6=9D=83=E9=99=90?= =?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":2,"Typ?= =?UTF-8?q?e":22,"Name":"Tables/=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1"},{"S?= =?UTF-8?q?tate":4,"Type":23,"Name":"TableView/View=5F=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF"},{"State":4,"Type":7,"Nam?= =?UTF-8?q?e":"Table/=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1=E5=88=86?= =?UTF-8?q?=E7=BB=84"},{"State":4,"Type":7,"Name":"Table/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=86=E7=BB=84","ExclusiveType":0},{"State":4,"Typ?= =?UTF-8?q?e":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81"},{"Sta?= =?UTF-8?q?te":4,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E5=B2=97?= =?UTF-8?q?=E4=BD=8D"},{"State":4,"Type":7,"Name":"Table/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=89=88=E6=9C=AC"},{"State":4,"Type":7,"Name":"Table?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E8=A1=A8"},{"State":4,"Type":7,"Name":"Tabl?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"S?= =?UTF-8?q?tate":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1"},{"State":1,"Type":1,"Name":"PCPage/FGC=5F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/FGC=5F=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E"?= =?UTF-8?q?},{"State":2,"Type":6,"Name":"Pages/=E9=A1=B9=E7=9B=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5"},{"State":2,"Type":6,"Name":"Pages/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=A6=96=E9=A1=B5/=E9=A1=B9=E7=9B=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE"},{"State":4,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=B2=97=E4=BD=8D=E9=85=8D=E7=BD=AE"},{"State":4,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5"},{"State":2,"Type":6,"Name":"Pages/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AD=90=E9=A1=B5=E9=9D=A2"},{"State":4,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"St?= =?UTF-8?q?ate":4,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"},{"State":4,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E7=BB=9F=E8=AE=A1"},{"State":4,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82=E5=86=B5-?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E6=95=B0=E6=8D=AE"},{"State":4,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82=E5=86=B5"},{"State":4,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE"},{"State":2,"Type":6,"Name":"Pages/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=A6=96=E9=A1=B5/=E9=A2=84=E7=AE=97=E7=94=B3?= =?UTF-8?q?=E8=AF=B7"},{"State":4,"Type":1,"Name":"PCPage/=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State":4,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9"},{"St?= =?UTF-8?q?ate":4,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":4,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8"},{"State":4,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=89=B9"},{"State":4,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98"},{"State":4,?= =?UTF-8?q?"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5"},?= =?UTF-8?q?{"State":1,"Type":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D?= =?UTF-8?q?=E7=89=88=E9=A1=B5"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1,"Type":15,"N?= =?UTF-8?q?ame":"ServerCommand/=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=88=90=E5=91=98"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E4=BF=AE=E6=94=B9=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"N?= =?UTF-8?q?ame":"ServerCommand/=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=97=B6"},{"St?= =?UTF-8?q?ate":1,"Type":26,"Name":"Upload"},{"State":1,"Type":40,"Name":"?= =?UTF-8?q?Plugin"},{"State":4,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=88=90=E5=91=98=E8=A1=A8"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98"},{"State":4,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98"},{"State":3,"Type":6,"Name":"Pages?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE"},{"State":3,"Type":6,"Name":"Pages/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE"},{"State":3,"Type":6,"Nam?= =?UTF-8?q?e":"Pages/=E9=A1=B9=E7=9B=AE/=E9=A1=B9=E7=9B=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5-=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E9=A1=B5=E9=9D=A2"},{"State":3,"Type":6,"Name":"Pages?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5/?= =?UTF-8?q?=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State":3,"Type":6,"Nam?= =?UTF-8?q?e":"Pages/=E9=A1=B9=E7=9B=AE/=E9=A1=B9=E7=9B=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5"},{"State":3,"Type":22,"Name":"Tables/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE"},{"State":3,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98"},{"Stat?= =?UTF-8?q?e":3,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E6=88=90?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85"},{"State":3,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E5=B7=A5=E6=97=B6"},{"State":3,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":3,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E8=AF=A6=E6=83=85"},{"State":3,"Type":20,"Name":"Serv?= =?UTF-8?q?erCommands/=E7=94=A8=E6=88=B7"},{"State":3,"Type":15,"Name":"Se?= =?UTF-8?q?rverCommand/=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE"},{"State":3,"Type":6,"Name":"Pages/=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83"},{"State":3,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 751 +------- ForguncyDB.sqlite3 | Bin 30720 -> 30720 bytes MasterPages/FGC_母版页.json | 46 +- MasterPages/FGC_母版页.rd | 8 +- Pages/007ea4aa4c7440478a9a092179dace8.json | 198 ++- Pages/57e644c056074f9d885f24a5bd7b4ae.json | 19 +- Pages/5f448cc5e408484e9837a0183cf1365.json | 28 +- Pages/6899a8cead694b3ba00307b6756dbd7.json | 59 +- Pages/6899a8cead694b3ba00307b6756dbd7.rd | 2 +- Pages/个人中心/个人中心.json | 326 ++++ Pages/个人中心/个人中心.rd | 5 + Pages/任务/任务-基本信息.json | 152 +- Pages/任务/任务-基本信息.rd | 5 +- Pages/任务/任务成员详情.json | 891 ++++++++++ Pages/任务/任务成员详情.rd | 27 + Pages/任务/工时/新增报工.json | 584 ++++-- Pages/任务/新增任务.json | 160 +- Pages/任务/新增任务.rd | 3 +- Pages/内建页面/FGC_修改用户信息.json | 1253 +++++++++---- Pages/内建页面/FGC_修改用户信息.rd | 4 +- Pages/流程页面文件夹/FGC_我的待办.json | 4 +- Pages/{项目首页 => 项目}/项目列表.json | 6 +- Pages/{项目首页 => 项目}/项目列表.rd | 0 Pages/项目/项目岗位详情.json | 510 ++++++ Pages/项目/项目岗位详情.rd | 15 + Pages/项目/项目成员详情.json | 879 +++++++++ Pages/项目/项目成员详情.rd | 18 + Pages/{ => 项目}/项目首页/项目标题.json | 32 +- Pages/{ => 项目}/项目首页/项目标题.rd | 0 .../项目首页/项目配置}/项目信息.json | 14 +- .../项目首页/项目配置}/项目信息.rd | 0 .../项目首页/项目配置}/项目审批.json | 0 .../项目首页/项目配置}/项目审批.rd | 0 .../项目首页/项目配置/项目岗位配置.json | 0 .../项目首页/项目配置/项目岗位配置.rd | 0 .../项目首页/项目配置/项目配置首页.json | 0 .../项目首页/项目配置/项目配置首页.rd | 0 .../项目首页/项目首页-容器页面}/任务列表.json | 0 .../项目首页/项目首页-容器页面}/任务列表.rd | 0 .../项目首页/项目首页-容器页面}/项目工时.json | 520 +++--- .../项目首页/项目首页-容器页面}/项目工时.rd | 0 .../项目首页/项目首页-容器页面/项目成员.json | 1011 +++++++++++ .../项目首页/项目首页-容器页面/项目成员.rd | 15 + .../项目首页/项目首页-容器页面}/项目成员统计.json | 90 +- .../项目首页/项目首页-容器页面}/项目成员统计.rd | 0 .../项目首页/项目首页-容器页面}/项目概况-关键数据.json | 135 +- .../项目首页-容器页面/项目概况-关键数据.rd | 5 + .../项目首页/项目首页-容器页面}/项目概况.json | 6 +- .../项目首页/项目首页-容器页面}/项目概况.rd | 0 .../项目首页/项目首页-容器页面}/项目甘特图.json | 187 +- .../项目首页/项目首页-容器页面}/项目甘特图.rd | 2 +- Pages/{ => 项目}/项目首页/项目首页.json | 4 +- Pages/{ => 项目}/项目首页/项目首页.rd | 0 .../项目首页/预算申请/预算申请.json | 0 .../{ => 项目}/项目首页/预算申请/预算申请.rd | 0 .../项目首页/预算申请/预算申请审批.json | 0 .../项目首页/预算申请/预算申请审批.rd | 0 Pages/项目首页/项目首页子页面/项目成员.json | 720 -------- Pages/项目首页/项目首页子页面/项目成员.rd | 11 - .../项目首页子页面/项目概况-关键数据.rd | 11 - Plugin/用户管理命令 V2-10_0_0_0.zip | Bin 0 -> 93337 bytes ServerCommands/任务/修改任务预算工时.json | 389 ++++ ServerCommands/任务/新增任务.json | 709 ++++---- ServerCommands/任务/移除任务成员.json | 321 ++-- ServerCommands/工时/修改工时.json | 2 +- ServerCommands/工时/新增工时.json | 1578 +++++++++-------- ServerCommands/用户/更新用户配置.json | 145 ++ ServerCommands/项目/同步项目成员.json | 16 +- ServerCommands/项目/移除项目成员.json | 215 +++ Tables/任务/任务成员表.json | 14 + Tables/任务/任务表.json | 13 + Tables/工时/View_任务工时统计.json | 22 +- Tables/工时/任务工时表.json | 15 +- .../{项目任务 => 项目}/View_项目统计信息.json | 34 +- Tables/{项目任务 => 项目}/项目任务分组.json | 0 Tables/{项目任务 => 项目}/项目分组.json | 0 Tables/{项目任务 => 项目}/项目动态.json | 0 Tables/{项目任务 => 项目}/项目岗位.json | 13 + Tables/{项目任务 => 项目}/项目成员表.json | 0 Tables/{项目任务 => 项目}/项目版本.json | 0 Tables/{项目任务 => 项目}/项目表.json | 50 +- Tables/{项目任务 => 项目}/项目预算变动表.json | 0 82 files changed, 8238 insertions(+), 4014 deletions(-) create mode 100644 Pages/个人中心/个人中心.json create mode 100644 Pages/个人中心/个人中心.rd create mode 100644 Pages/任务/任务成员详情.json create mode 100644 Pages/任务/任务成员详情.rd rename Pages/{项目首页 => 项目}/项目列表.json (95%) rename Pages/{项目首页 => 项目}/项目列表.rd (100%) create mode 100644 Pages/项目/项目岗位详情.json create mode 100644 Pages/项目/项目岗位详情.rd create mode 100644 Pages/项目/项目成员详情.json create mode 100644 Pages/项目/项目成员详情.rd rename Pages/{ => 项目}/项目首页/项目标题.json (93%) rename Pages/{ => 项目}/项目首页/项目标题.rd (100%) rename Pages/{项目首页 => 项目/项目首页/项目配置}/项目信息.json (97%) rename Pages/{项目首页 => 项目/项目首页/项目配置}/项目信息.rd (100%) rename Pages/{项目首页 => 项目/项目首页/项目配置}/项目审批.json (100%) rename Pages/{项目首页 => 项目/项目首页/项目配置}/项目审批.rd (100%) rename Pages/{ => 项目}/项目首页/项目配置/项目岗位配置.json (100%) rename Pages/{ => 项目}/项目首页/项目配置/项目岗位配置.rd (100%) rename Pages/{ => 项目}/项目首页/项目配置/项目配置首页.json (100%) rename Pages/{ => 项目}/项目首页/项目配置/项目配置首页.rd (100%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/任务列表.json (100%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/任务列表.rd (100%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目工时.json (60%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目工时.rd (100%) create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员.json create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员.rd rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目成员统计.json (64%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目成员统计.rd (100%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目概况-关键数据.json (84%) create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目概况.json (95%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目概况.rd (100%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目甘特图.json (83%) rename Pages/{项目首页/项目首页子页面 => 项目/项目首页/项目首页-容器页面}/项目甘特图.rd (71%) rename Pages/{ => 项目}/项目首页/项目首页.json (91%) rename Pages/{ => 项目}/项目首页/项目首页.rd (100%) rename Pages/{ => 项目}/项目首页/预算申请/预算申请.json (100%) rename Pages/{ => 项目}/项目首页/预算申请/预算申请.rd (100%) rename Pages/{ => 项目}/项目首页/预算申请/预算申请审批.json (100%) rename Pages/{ => 项目}/项目首页/预算申请/预算申请审批.rd (100%) delete mode 100644 Pages/项目首页/项目首页子页面/项目成员.json delete mode 100644 Pages/项目首页/项目首页子页面/项目成员.rd delete mode 100644 Pages/项目首页/项目首页子页面/项目概况-关键数据.rd create mode 100644 Plugin/用户管理命令 V2-10_0_0_0.zip create mode 100644 ServerCommands/任务/修改任务预算工时.json create mode 100644 ServerCommands/用户/更新用户配置.json create mode 100644 ServerCommands/项目/移除项目成员.json rename Tables/{项目任务 => 项目}/View_项目统计信息.json (84%) rename Tables/{项目任务 => 项目}/项目任务分组.json (100%) rename Tables/{项目任务 => 项目}/项目分组.json (100%) rename Tables/{项目任务 => 项目}/项目动态.json (100%) rename Tables/{项目任务 => 项目}/项目岗位.json (84%) rename Tables/{项目任务 => 项目}/项目成员表.json (100%) rename Tables/{项目任务 => 项目}/项目版本.json (100%) rename Tables/{项目任务 => 项目}/项目表.json (92%) rename Tables/{项目任务 => 项目}/项目预算变动表.json (100%) diff --git a/.collaboration b/.collaboration index 8bb4f077..676464f8 100644 --- a/.collaboration +++ b/.collaboration @@ -5,16 +5,7 @@ }, { "ModuleName": "Table/任务成员表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:56:04.02975+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务成员表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务状态", @@ -22,16 +13,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:55:00.5317989+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -79,16 +61,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:43:23.8730886+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -96,16 +69,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:38:07.3810815+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/流程表文件夹", @@ -137,257 +101,81 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423703+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423726+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423738+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.242375+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423764+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423785+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423797+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423809+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423821+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, - { - "ModuleName": "Tables/项目任务", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778472+08:00", - "ModuleType": 22, - "ToRemoveFiles": [ - "Tables\\项目任务" - ] - }, { "ModuleName": "TableView/View_项目统计信息", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778621+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目任务\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/项目任务分组", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778572+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目任务分组.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目分组", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778581+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目分组.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/项目动态", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778596+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目动态.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目岗位", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778604+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目岗位.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目版本", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778612+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目版本.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778552+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.077863+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目预算变动表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Pages/任务", @@ -403,17 +191,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0839419+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -429,17 +207,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:58:33.1526761+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -471,17 +239,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:30:58.0207601+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -581,17 +339,7 @@ }, { "ModuleName": "PCPage/FGC_修改用户信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:05:27.2770218+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改用户信息.json", - "Pages\\内建页面\\FGC_修改用户信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_忘记密码", @@ -651,17 +399,7 @@ }, { "ModuleName": "PCPage/FGC_我的待办", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:28:55.7892312+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待办.json", - "Pages\\流程页面文件夹\\FGC_我的待办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的待阅", @@ -719,273 +457,65 @@ "ModuleName": "MobilePage/FGC_流程追踪_手机版", "ModuleType": 2 }, - { - "ModuleName": "Pages/项目首页", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111541+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页" - ] - }, - { - "ModuleName": "Pages/项目首页/项目配置", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091554+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置" - ] - }, { "ModuleName": "PCPage/项目岗位配置", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4090339+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目首页\\项目配置\\项目岗位配置.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目配置首页", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091503+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置\\项目配置首页.json", - "Pages\\项目首页\\项目配置\\项目配置首页.rd" - ] - }, - { - "ModuleName": "Pages/项目首页/项目首页子页面", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4103339+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7292812+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\任务列表.json", - "Pages\\项目首页\\项目首页子页面\\任务列表.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7294423+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目工时.json", - "Pages\\项目首页\\项目首页子页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7294786+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员统计.json", - "Pages\\项目首页\\项目首页子页面\\项目成员统计.rd", - "Pages\\5f448cc5e408484e9837a0183cf1365.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.729545+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况-关键数据.json", - "Pages\\项目首页\\项目首页子页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7295758+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况.json", - "Pages\\项目首页\\项目首页子页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7296044+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目甘特图.json", - "Pages\\项目首页\\项目首页子页面\\项目甘特图.rd" - ] - }, - { - "ModuleName": "Pages/项目首页/预算申请", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104417+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104288+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104403+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请审批.json", - "Pages\\项目首页\\预算申请\\预算申请审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目信息", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4108309+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json", - "Pages\\项目首页\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4109742+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\项目首页\\项目列表.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4110544+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目审批.json", - "Pages\\项目首页\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111514+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json", - "Pages\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4089171+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页.json", - "Pages\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1001,17 +531,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:03:51.0069615+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -1027,29 +547,11 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:28:04.3553147+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:01:35.3993179+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\移除任务成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/工时", @@ -1057,16 +559,7 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0839629+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -1074,16 +567,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0836605+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1311,19 +795,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2427779+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1331,26 +803,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:30:17.6818074+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Microsoft SQL Server-10_0_0_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\PC组件包-ElementPlus-10_0_0_0.zip", - "Plugin\\加载动画-10_0_0_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\富文本编辑器-10_0_0_0.zip", - "Plugin\\支持预览的附件上传-10_0_0_0.zip", - "Plugin\\甘特图-10_0_0_0.zip", - "Plugin\\自定义菜单类型和树类型-10_0_0_0.zip", - "Plugin\\设置当前行命令-10_0_0_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1370,196 +823,74 @@ }, { "ModuleName": "Table/项目成员表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778563+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目成员表.json" - ] + "ModuleType": 7 }, { "ModuleName": "ServerCommand/同步项目成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:35:24.504575+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\同步项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7296892+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员.json", - "Pages\\项目首页\\项目首页子页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:13.0515721+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/项目配置", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091577+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7290326+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104427+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111554+08:00", "ModuleType": 6 }, { "ModuleName": "Tables/项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778489+08:00", "ModuleType": 22 }, { "ModuleName": "ServerCommand/移除项目成员", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:54:06.8571086+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/任务成员详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:11:07.0588136+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:54:54.1017673+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T12:07:51.0575309+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T12:24:10.5320953+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommands/用户", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:20:35.4360926+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/更新用户配置", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:20:58.7553271+08:00", "ModuleType": 15 }, { "ModuleName": "Pages/个人中心", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:25:50.8142657+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/个人中心", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:26:54.6505208+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 6202008c488e67079e507a532b0c847cb294eb04..93bec72f74d0a2c4d10236ce416ad3a351767293 100644 GIT binary patch delta 35 jcmZqpz}WDCae}nqaRvqkIUt6C;}dm^8INyFSWpfCqtgj1 delta 35 icmZqpz}WDCae}m<1Oo$u91z2R#6%rqMv09H3(5h9%m*F- diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 8f3ff57c..271081ac 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -123,7 +123,8 @@ "DefaultSize": 230.0 }, "Values": { - "1,0": "TeamAction" + "1,0": "TeamAction", + "5,0": "%CurrentUser.UserName%" }, "AttachInfos": { "1,0": { @@ -200,6 +201,41 @@ "CanVisitRoleList": [ "FGC_Anonymous" ] + }, + { + "Value": "菜单1", + "Text": "待办", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_我的待办" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ], + "Notification": "1" + }, + { + "Value": "菜单1", + "Text": "我的", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "个人中心" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ] } ], "Orientation": 0, @@ -738,5 +774,11 @@ "Size": "1318,46", "BoxShadowString": "0 2 0 5 #175D7183" } + ], + "CustomNames": [ + { + "Name": "母版_当前用户", + "Formula": "FGC_母版页!$A$6" + } ] -}//usZid/V0A7ZKbhUgBTW5LXGaXaaB4ckKj/APc2PLjMtQZYqWxT2CbXhcQO1udPVlmRBakLePFKTkY9tgnoPsJbktpSOFZ8ZUVfZvroKoR5LAKX1VIxm7QfZRkdDrKojmH7RsbSzipKsQDsR15Wvz3/9VZts+093xlLFLMr76ThiRC4FXojD3iS+Pr3k8oHxyYYwnI01gFpefHqO+Q6MaxayH/eJO/PpW7IqzlLt3GudmD5of/JvZ84eL9cshrOrH3Ajxtbkfqhv9i5k5F//ofyWlCJ1pXJKgJPgEs2lqfyL2kJbvzxGVMbXhpsWRah7aYfqFUwRLi1Rzv9tbIWwGgJ9NmD+Btk1ApnypoDkBYbytokt5gFir74nu14JDYy2tXi+ABUa/vdHaS9WaS5BQf5mafyye/BETI8TTeNKP8y7nHsm1EtL1rWCpjZo/VWu4JEiarWxOnldEgBF4Xg8Ac4/G+zpTri2QKm6cBulwtcJJ3UFoo+wCRguxk+42TccKCNxgM/VYHMsYDzy7+twpQkMj/apzIwaBdRhnz95g4+hX/2QbbWtZKyJPMadeVpFnFJytdbiW0j/XvQW1aW1TeInE28YaemPC1DHQ4uBAAYS9SbfZQq9CYOkQGCm1D362iJbPkHREyYs3XTK/QQuDzFZIH5VhtMlwy1rFFbdC6Ekc4zTRYLekrYkA5szoNCfwpSwftYwlIW0S9voJf+Qz/IEijEBovBAipK9ZPM6fq8iNNXEFXR/mGfKSZgVOGckV8P3Y2uQDlpzt9dbcEOOqmXpj4NIoS9ACEnoIwCH9M3ashABNAhdrpV8AmKAjvFoJ9S7D9M8eyIx8ARNwYZxnzXrCpfylntQeFghsQgqPZ4+kIgURLAN7PsQYh3m7jv6mO4lKyH4pq7LU18MFEM/2Uw==|920 \ No newline at end of file +}//M4oVo1QlGm1yE/GwIS1ZmSBawwNroqeJyUqRQopvB0sdgKu9if4le/bhAD/kTlH7OCPsrbDm0UPO1Il7yKv/SMeS7KSrpnSSTqJfz4/3JDC5dxp9mQUlkAMO80o8AtVpxkmVQkIaB3aso58t7Rq8pOzPz8ogytC5mT8ljjfHR4X91gTcv2mYQIkgAIBBsiCK1fey/sZjUKQHgh94iI9Tyxp+JRNPVLY2QuFWifbiwkuza3B2cIueenTERuNOrh94iI6jQSwj99dynvKmrZWZl8/CB8003+wNx5BzMLp8biM2DRP/npZoeLizvQ6OEQsUU3gHRYoJqRMm86Bql2ZORjZowICnG6m4maV3ebfl7AMOppKuyB/1jn2fR9uWc3tHFfpTC63ZzA0TMpXgXjBWActNFUazlytAZTU2WX16QHLJu94U1MiMBdZC1KFecEZfgT9YX4U7RNgTUfInB2AACyvvXvkQg4lpEDi0WsrGCnKhg4993RtIwjedpczwQqxsJgyCr+Htj0hbe4GhepVXfMYtfew2QxBnlOcf/0yiUlBEZicz0yLby8Gd7vOB+YozNxz11T01tCwZGS4OmXEcAIfv5ilJ2zIpzWLeLXjb2zv+3na/MTQ2lO80s/jtDliETSQhvQ76oRhfg3nGeh/e9+XAOmdGeYS16WWO56/GtWNOf5gbnU44lv36zPVhZOvCdVAQSC8DGo9xvGuT79/5YmtdCNZyBkjgc+BC3FQisgEf8iYo8Q3aZpEnLne6yHuJ0Nb0DZBRnJvvv4m4QzDbgu3P1rchKO3nVzwbSIyqXaoac/3kiPH25Fzt81HxSOaDZQZiKSj01MYipzFuz/YikNtEFTSZbYxRmAIWdPextUwre7dtAfCiK9s9EuZFwO934vVr52WlGB8f2qIRFgJNPg==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index c386a267..20f8b203 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -1,5 +1,11 @@ { "PageType": 1, "ColumnCount": 7, - "RowCount": 7 + "RowCount": 7, + "CustomNames": [ + { + "Name": "母版_当前用户", + "Formula": "FGC_母版页!$A$6" + } + ] } \ No newline at end of file diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.json b/Pages/007ea4aa4c7440478a9a092179dace8.json index 50586e2f..a5e56b4f 100644 --- a/Pages/007ea4aa4c7440478a9a092179dace8.json +++ b/Pages/007ea4aa4c7440478a9a092179dace8.json @@ -12,23 +12,18 @@ } } }, - "InLogicalVisibleIndexes": [ - 7 - ], "Count": 8 }, "Cols": { "RowColumnAttachedInfos": { "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 1 + "DesignLengthInPixel": 20.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 1 + "DesignLengthInPixel": 20.0 } } }, @@ -36,7 +31,7 @@ }, "Values": { "5,1": "姓名", - "7,1": "岗位名称" + "6,1": "岗位名称" }, "AttachInfos": { "1,2": { @@ -47,17 +42,14 @@ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "默认头像 .png" }, - "badge": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B8" - } + "showSystemAvatar": true }, "TemplateCellSource": "项目成员" }, "5,1": { "TemplateCellSource": "项目成员_全名" }, - "7,1": { + "6,1": { "TemplateCellSource": "岗位名称" } }, @@ -68,19 +60,29 @@ "HorizontalAlignment": 0 }, { - "FontSize": 13.333333333333332, + "FontFamily": 1, + "FontSize": 12.0, + "Foreground": 2, "HorizontalAlignment": 0 + }, + { + "FontFamily": 1 } ], "Types": { "Strs": [ "Center", - "Body" + "Body", + "Text 1 50" ] }, "CellStyles": { "5,1": 0, - "7,1": 1 + "6,1": 1, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2 }, "SheetStyle": { "FontFamily": 1 @@ -89,7 +91,7 @@ "Spans": [ "5,1,1,5", "1,2,3,3", - "7,1,1,5" + "6,1,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -98,5 +100,163 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//nRyUAlTDYqOMDM39ZB45s/9q2kYfHClHINh/9JTxjbM8c15loi7/v2Pckqlk11VcSvcwv5gQvkmBBgFjpKwUy1TvdxV2vjP0w193xvzCKtmS7reGxBlpuabt+YkvCuGJhWZsasKRqoS1xjfxl7f+03D7EtIH0LzdWQ2gjP0lJync66VtDW1BNdBlmfZ5P0hY4glCzWCqQdy/vwmpEBhpGbMj91+AkJMl1xVaCb0k/d5T9UO1P/47nBZ9MmoTqpAauo3wPoKcJXgGX+AlQh7yFgEGSdaEiBJwVv3WH7Dh+eQ9xZT6M5oMncOBD+HUogmlVCa7TXcajyxJpciBvrTQl+ytmi7Nex9+rYDsQJcAy8N3gwElx+bzkjf7YE0z6MOa2RtOEhr19WSMcj460HiuXyQsiwgACN6CaL+c+EoYBpk+PkWWBTj4TuZeM7yhjzIEbR+lwtf15RudxW6NvOerXXail+7IgvPt8iHZJgrrGeyER3idj4T/eUWfPxMmlDShTxnvuZqdGe1ErGoSnnb3zBL2hfL7Z8y0RBA/LqhpHgH7pmmPssnLp1/6qLI7bltXR5nLCiPBk+Vqsp5/5s+TvADnhJnbGcWuAE09LEWog/GxNYDHVFyRNesb68q+Z0HzeyI8VFy7OOKHqvt7LDRaCL2IhLbA/ZOgMtMi00gPi2Rq1TsNOjYq/6cCXTKG2up7UmAGyOy0jFFCzsHkJ6g2frrzeHg8SzCfsh264UH514MM1w5VUopVAAOb1qnsW3wUbXhhVn5tcfMWF5Fb/z5Ybv9hnEmcuVghnMBvyxkXUdMWsQS+dfuYA5ylB4z0A4fMOijERR10eUOoWaIBeywIjHuyA3EEIg0fjB8fKOlqNB8GVociy5rl+jkXyPTeuqAbrmZz5XlMr3sDIvagLkvE8g==|920 \ No newline at end of file + }, + "Pictures": [ + { + "Name": "8c096078-eaf2-4436-9b02-2b6ddf4443e4.svg", + "ForguncyPictureName": "更多.svg", + "ForguncyPictureSourceType": 0, + "Stretch": 2, + "PictureCommands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!G1" + }, + "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.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "5fecf1fa-ff1f-4af6-b695-b8c03c0cd264" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "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.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!code" + }, + "BtnText": "知道了" + } + ], + "ID": "151bcc86-62ba-4346-8f45-5ba1fe0917f1" + } + ] + } + ], + "ID": "0e19c90c-90de-47a1-a6c2-3a03b040cbd0" + } + ] + } + ], + "ID": "e52bf7d2-8113-4101-8fc5-0b7c9a974870" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" + } + }, + "PageName": "编辑删除页面" + } + ], + "ForegroundFill": "Text 1 50", + "Location": "113.90476190476193,5.714285714285715", + "Size": "20,20" + } + ] +}//CIl5LZcK9rI/yFt3Q6j9+h8vdmEHR0bUVylxOhByceWEiaOSf8fah+OlhlinICIeI/qj58kXF3EyKqJ1UMK7CE31a7Pq/fCDSBkE8DmGbVK9sUoX+Cuv39+i2FV+UG5QPbKWyty3DD9gA/qLQI+5v7a1AWWMv928Oc2mf4JC0Da9XukjM9EOssj0Gj/8rh1AobRE8E27N1glr4tHN9I0edLHv5rYh0xRX7Q1aYhp6VytxFaZ9yuwZo5o0YV8Eq8M2DQiQu0LpXxBECD2Gv9DejoUhUdqWEQ9rjfRuzfmY/rUi8wrLU9k9Yz5kksBDCgF/KLJSK9uvHP/y2EnuVW3JLo9MWDwoDEwUA2AejHKpf0ym5ZuFRpxtTl3s7Q618ywINaFBowJ3kKZRKCq7Sd2+ruj2hZ9LBp59ZgglasOS5xevlmlFhGS4yB13rgoeYHR5tuPEz8G3cpu+3pLtNC0Y+mHEJYRDBZSvSlJddPos4165ve3bKLhkF1imOa+PkYfkMMw9pGywFZE0Zxi19jsnX0qQ4DeOx4luQaeQdfQgBjvmrAcmmMLJVTq+Uiwa3Nmptz6k0Q5teSPVFNMuTesLJbTRuab3p+7rBBMbfBGPS9Ihz9paxpIYgt5+5YVF6oMepOKFZXGtncn6qTOmWpUM4NXR9IMSPWeqU/23hWsZX+GFCC0ojdQuoYT3BelHppenwzXTt7DFtvUH+p7Kf1MG00+0Ys95GKw6NrjAWu2LaofgR3YlBR6iH/MfmOYIy1REPnP0Yeh6abF/yg4I1DEJBwBnZ8clHGIVtSovXKPQ0JFLGvZDVafNsofv3egrMYqehH595s9cQcgaQ5lGDTCC19kz1V1xhe0D5i7UXBJ1Tt8/S6q9BmAw3SxnDZ+yAUGOrkpuJfoDkzMTZyxLWswSw==|920 \ No newline at end of file diff --git a/Pages/57e644c056074f9d885f24a5bd7b4ae.json b/Pages/57e644c056074f9d885f24a5bd7b4ae.json index 0157d2eb..7aab98d4 100644 --- a/Pages/57e644c056074f9d885f24a5bd7b4ae.json +++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.json @@ -88,7 +88,7 @@ "FontSize": 13.333333333333332 }, { - "FontSize": 16.0, + "FontSize": 13.333333333333332, "Foreground": 0, "Formatter": 1 }, @@ -98,23 +98,22 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 3, + "HorizontalAlignment": 4 }, { "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 6, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 5, + "HorizontalAlignment": 4 } ], "Types": { "Strs": [ - "#FFFF0000", + "Text 1 50", "0.0\"小时\"", "Body", - "Text 1 50", "\"平均时薪：\"¥#,##0.00_)", "Left", "\"预计收益：\"¥#,##0.00_)" @@ -157,4 +156,4 @@ "PaperSize": {}, "Margin": {} } -}//NHFLhdQ9xFpmSDGVOA3fBqpqjayYzvsPTQWxdxoeiihLx7InmwahmSkKoccRhHnMr7dEopO7AdsbB1yTnWtOR827prub9H/DEMtJUvZz4B8Wu7/3HvYenetiEsTPllEnuaShZ7jnG+sVHDf8m0bM8m5mtVP5KuJCFdBkZUdE6PXYGUG/7OjR06qRORDdpRMhKoQ7cnvd5AJ+pG0efX8HxQgTQpVLUR4Oq8ied8P5tJorrexYZjxbL8onJoi7HyDk3wespaJZT9Ax42nFYp/vMrmoPAjAcns/tscghWHrSTpsAnXAksJWM9l5rfRuYLRCWhZxAnDY0DtReSiRYYlYc7wVDStKmqGyGGrT1Ss83ESWHppkgd2M2uwfUyyOCck1Uj64oawHL+fXC3g+/TYwsAd9CKRVrY4a3ZJd0OyDLPC3DHpR91iCRwm6kY3qrR0K9wQoU/xhM3gBsTgCR1lyK4N1JiNtXfoR94KnAJx+QkjJyK3x3DhKwix+wsNBVGkdiMm6ykELfH90qnOWNmhBYi83aBK8Topf5TCEdiqggTqoky21bljekbBnDyu94W0Cy2vXOTYCNcpYpsexAidabgAlMu97iN0Tpby9OJGnZ0CvkGPzGw9OigA6MDs7PAfgqxldcO+2mrTNWoV11L9snoeCECyL/wv92Mth5TrAebmKL/f4WjgSnnGENoqU4IGi1AaxPhTtQ5G69//ub5rnI5ca47Aj/oqhWrI2MDTUBgoiCS2wI+60kMTY52GCqF6pI6BqBxYkH/hLkuu3eH+YY5SS/hKpTylCq+BzvjwmFhGXzCus3jKSlTcDnbFq76wjnuvPQO/8BLvekGO5C4JTNe6EwiWLH7M2sAHmAhrXf86Dn6LO3l1Jh+ZVrpM+NB2wylmdNUFGr5yk9ZQ4VxXfhw==|920 \ No newline at end of file +}//5+Ieatrr6LJlpn2HIuAwlXygZgT6/+tGPJutQTy4cBVmZmO9/4UltUxET2ompDoci471m863x97PBv3hIH+vkFD1SqRQVWYNfomXjWtp4BQztD7+dSnc8X3RgeWH0SgoMR6WfR/nQ1rqiJpBqm/4EMN9QMdteDPPxtO3bIiJwVNO9BhaGja9EGLQULfpq3pu0x6+WuBC1an2McDQOzn4OrOK0Nn898wUXgnjKVpfpbN0D1HNO5vUj4AmLWusnTyOndjio92JpTHIfJKhwMqRFgzQ2rYlabQtQSduHFcu7uessA9qmMG9INJGSWHuBRHAqBLvazzBh6NwNme6jUHFv1gPEA4OSjp5qsgk/Q1arAZXQlHRcdvJueFvM1gYD1HO+K9oMqNNAyIpW70VpJDJbJ5Oj7/vBPbPLoQaUtATPcb4loESBKqOC5mGYm8mMkdT8R2l9dx5TNFz3zOgsWbhWLBvjWHz5IgIZH1VgPHGn01BPH6IevPKRJWW39oGtIik0w6J4mgT8aE7MD3LMB1PFW2OUKzSY7fZb6rN+/iuDro5MwIUD24yh7hjZuJ+bp3UYQ6Aj8q3EW4Siz6rjGNvHKRv9hvd6mqSG+raZPEgKlvy7SIpyNYt9U0GTrAGkUmh7w8uJeEegv6hKKD2Zjk6sVhRlLGvZBx7nm9srIVBfhJsIHpyT76UCKlx+bytsi7xrol4hYXjk0uNDpZ5oIgf/uJ32S4Bddau0e1uGNSzoV2bSbpXV3GlmYLiYsZItCRh4dvV/sQ9cXmK+mh7bGNwROrIEWJbsjoHK2qx5sMDxNjCIUlcTaKSfNLzMrZvqH36+BRMkG3Wn5bLt/OMyngSJ/Z7O0BhyDA5AuMHGp5nBiwGgf9RBVKX+UJaylsuxQwcQpVwXCCdnOLN2lJEAxsjtA==|920 \ No newline at end of file diff --git a/Pages/5f448cc5e408484e9837a0183cf1365.json b/Pages/5f448cc5e408484e9837a0183cf1365.json index ee114cae..245b914d 100644 --- a/Pages/5f448cc5e408484e9837a0183cf1365.json +++ b/Pages/5f448cc5e408484e9837a0183cf1365.json @@ -11,11 +11,6 @@ "DesignLengthInPixel": 77.0 } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 @@ -30,6 +25,11 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } } }, "Count": 6, @@ -71,10 +71,6 @@ "Count": 6, "DefaultSize": 15.0 }, - "Values": { - "3,1": "执行人", - "4,1": "0/0" - }, "AttachInfos": { "1,2": { "CellType": { @@ -84,16 +80,15 @@ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "默认头像 .png" }, - "badge": "初级工程师", "showSystemAvatar": true }, - "TemplateCellSource": "执行人" + "TemplateCellSource": "项目成员" }, "3,1": { - "TemplateCellSource": "执行人姓名" + "TemplateCellSource": "项目成员_全名" }, "4,1": { - "TemplateCellSource": "工时情况" + "TemplateCellSource": "岗位名称" } }, "StyleDatas": { @@ -122,7 +117,6 @@ }, "CellStyles": { "1,2": 0, - "1,3": 0, "3,1": 1, "4,1": 2 }, @@ -132,8 +126,8 @@ }, "Spans": [ "1,2,1,2", - "3,1,1,4", - "4,1,1,4" + "4,1,1,4", + "3,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -143,4 +137,4 @@ "PaperSize": {}, "Margin": {} } -}//HPpArMuqS53AVLQNK4SAfvaAVWP+PygKjDgnjxp6uzqz3VeXopU6gFgNEcm2afmnHAgpWQA22toRcCH7qen7aW30wLo2I2gmX9e339cyrDxROcNufmP/htxttSi4SjNw+T16bfVduOMcQtcBU2ebSGZ4qBaht05QnMn3GJ9dZ6ybHI/tVQfv7AT7REirVR49wDzkB2pCKELLZ2C1anV23EogbVAB/3WvMCoI3pXGNIRIlFejVUTpAHVR/ZyhKr8Q4sCB4MX+J4BAmxVcnmIwX87Ie9k2nD+mGKZg0dUZf9prcl5MEs1SYK45j2Tl1bTqviUpxxBWMurT+qSfAg9ifGpTFacw92DEb1CbFJTVQgyPUnE6fY+nUeHrufMxNhuGRUBnAwjL3SNtaxfmv8O4LdrvZ0CKqfnPXwyACBFZtiKa5af36eN5TPvlFC+5jChKyX/9mTX4LSZeokelIyTsiQM/LzHnWsO8z95+wtE+LW4D/+kX11B+eppnVWdduLQr7jzjX26Hxx3X8rSL6DrsIoNOhb/rzEtyv088CP3u7InSTTHAK4Yrf0hVhGsBzFy2QkU84LV6O11ay1xRyVNNZonWu53D7bRjeKERC3lnu9UmqGQlzwNhoHvdZqJ8DZzIxtATSOoTsJA41AsE86bNPOloeZbimvvrGx8JcUXs5RSQGmei7umO9tuLxwZprWGjPdd0eR6jLfi+89CDLL1qoGC5b/EqHhD8HY5h//jm/YGX3l/yFvYWKnTLzA1t6K/nkGKmFW7zloZVedCjahd26QbHKVet9KcA9qhjwnV0xspYMqrn1qUxqQ7YpcKDn821iUx2/i4P/wX/gf+fz3D1Ecg8X0NkPMY56wE4vwu3TzJfH2o0zzWzNz8BjjuvgpCkpilTj6iH5tbNLx2rd8/0wA==|920 \ No newline at end of file +}//yKkepqve6OUNl4xg1a5oIc4GzBNOvf3ehJhaFhVglTW9DTLyE7rkx+hrkAy0L16M8qFF/czEADi3c4LhCSWU9C93+epWDuDt2K6gVhaV5dmypeCvBjjf681qvxYO2Oc3PFQRlY0eoak5IunyGmcFihb6QfNISzHYHITkErTLsQqQAyLeymmsgQCb5IB1OYhK1LmdkGUp2kTBsDYszr7Yfyv3YnjIizjTC9tuVyRfsAeysMHVXhui9Mp+K2DFoBmLgBZ9VcO/kbP5nGndcPen/qBEhqwETN4HEaSMhcpN3py7b0bnBQsqtAr/K6j9J1p7gKs3+VCZhNrZ6a1TerxLpDBdCOV3vXfm+wyD5P6EanJIBonL4jBtU/z18x49bB11xY8YqO6+CSVBIDH4HGSUlcApqWhtUtCLwCF7WyPsbRpFLeABPJOXLVGV1cRvdGrUyejpJ68LKTtSUeitFpF4FsfwpF+Kas/xuRr9J4zJxcqX3PHeelkD/FISGq+IrIu6D/MFfh7QgrVGZr8IJHu/M16OsBXTnFH2t7/xrf1sRwgVnx46dRrdDLoSWzS01f31hmi0jNQUN3DboUuVftrTVHYzYMTkI7p8W3MtfLXVOtnRYPoTMhPJ5/9IUl8nGC5BP8ot640H79fWjJGNvJwRg/hsb2En7w/QdwvwFkcyXOAdqWRbQPuyfUFxgfnb49uJ/E0PI8pluAcN5yPhNZMp8bX0w1Hc11VuKVW267K28Hi2pSx3TYEuncTiYZFZnxawvKUsRy/K9S7DAjLs5NPhKNgdjQlJQCFFQbRKBJtIC9kAU5IcmFQJ8ZK57nGRusVqWrywdytO+iFc8XaflP0+7x5l04MGp/pB97iZKKEPeHmk7u4pMla1Bnv4cgdUCHETpP2Ly8n8MEI3q26LyWZ83Q==|920 \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.json b/Pages/6899a8cead694b3ba00307b6756dbd7.json index 3f6f07ce..d7c77c2d 100644 --- a/Pages/6899a8cead694b3ba00307b6756dbd7.json +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.json @@ -22,17 +22,12 @@ } }, "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } } }, - "Count": 6, + "Count": 5, "DefaultSize": 10.0 }, "Cols": { @@ -63,23 +58,19 @@ "Count": 14 }, "Values": { - "1,1": "执行人", + "1,1": "岗位名称", "1,8": 0, - "3,1": 0, - "4,1": 0 + "3,1": 0 }, "AttachInfos": { "1,1": { - "TemplateCellSource": "执行人姓名" + "TemplateCellSource": "岗位名称" }, "1,8": { - "TemplateCellSource": "总工时" + "TemplateCellSource": "默认时薪" }, "3,1": { - "TemplateCellSource": "平均时薪" - }, - "4,1": { - "TemplateCellSource": "总提成" + "TemplateCellSource": "成员数量" } }, "StyleDatas": { @@ -88,7 +79,7 @@ "FontSize": 13.333333333333332 }, { - "FontSize": 16.0, + "FontSize": 13.333333333333332, "Foreground": 0, "Formatter": 1 }, @@ -98,26 +89,18 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 - }, - { - "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 6, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 3, + "HorizontalAlignment": 4 } ], "Types": { "Strs": [ - "#FFFF0000", - "0.0\"小时\"", - "Body", "Text 1 50", - "\"平均时薪：\"¥#,##0.00_)", - "Left", - "\"预计收益：\"¥#,##0.00_)" + "¥#,##0_);[Red](¥#,##0)", + "Body", + "\"成员数：\"0", + "Left" ] }, "CellStyles": { @@ -125,19 +108,10 @@ "1,8": 1, "3,0": 2, "3,1": 3, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, "3,10": 2, "3,11": 2, "3,12": 2, - "3,13": 2, - "4,1": 4 + "3,13": 2 }, "SheetStyle": { "FontFamily": 2 @@ -146,7 +120,6 @@ "Spans": [ "1,1,1,7", "1,8,1,5", - "4,1,1,9", "3,1,1,9" ], "PageInfo": { @@ -157,4 +130,4 @@ "PaperSize": {}, "Margin": {} } -}//eMOh40/TLJmYGCua46SYjP2eWaxcA/GbWbGb586yVfBfOlONx9VC+2Fs0Mut8tcVqtz02VKlUxQrJBzgGFwoyIXAX3eCrzdJFGaiAospjTNUIwwUYswOL0b0C79Nm1Fi7kL0ZASJ2+2dn6K7urdQuSliwFX38w/keGb4ieqJw1Km/yUQtr4wVQ5STrfIjOlysQeO3ncYYbiE2YVTTtFRs06IGVTPKO7tMfnsupL0DV9gY8448LLyR4Kibe7c6XoQd44LM6gxzHcocl3uSvvIKV5cd0qk+HQXA/8KAGlOragBxDG3Mr1Tvf24ZWtP3rVFiEhzWvnqlp/3QPfNufFe252hJgdGS6Ohxp9jQQ8C/3svBvbUPkuCPSP2UteLkRcFjWtnbX/hQ74AWC2fR9/aWOPt8ucuRQZaBGVV96iqfpdkK2kAiUJrBAHZX3vWjfhdynFXwxA4uhmGO9mqXh/aqWU1K5u2MBML4+bfuRE4yM+oPld18BHzfHdIKd1onVgzOKjOO0DUADR4fbK0WqCeHhiyJP30wQ7mfUZVxrwOvOucQs6x/Z1k/f6IdGnvxlhcVk9GNxjs9ArLRiJNBy2E5ksOYlGCk6ZXdjDUS9eGDD4Ob0qhBwvrG7ri9HlD5yTfCqD7DOF2o2CLmcvecy9SAWHYNF/GlOaYZJdqPRXJjqK+T7D20TF/qWazIGJQEgXO2jZ/DLq1QebuIShQJ5ap4RDfKZiHH43+XCwhkWCZL1ad9QEuMsPwfLq/GHrfslqHL9GFuONGw3p8vZFdrTDb30cxWbZ1l8Xhh9EWywaQVzITx/8Yy9FtwwPxk3EJgyZ+64j9ZcovlqIyb0FMKQI1M3l8SEzX/D0PFKwM40A00NRRKzoQH6igSvoeRrIsmAohrAIQSBwz/lkVvzX2Ougqjg==|920 \ No newline at end of file +}//2muNNltOHxY9fW6n54mdI7iYDyOI6h8huutueoXMzNsuRms2DOnY3kRTu73I6xFtUdp22VA1DjpOi+uE3pIZiVjQsc0xx0A6U3czAhurxArrkmFXmDzc2h04U/cjFOVlRe6U1dS3RTTxXWlNuAVaIfwbsXDm3ben5GtfupVA/IWvjyDUpD3octOr92GJzZRIacE9JD2pCd7cutTeKKRHWiavYGVWY1J4mFP1dG+pWuxeyVegcRiTJgAs/XH0Cs58Zv7uh/YMOf8rGAKJrV3oKTQUnVt7r40FT71HRgvvoQ+3sYlvpX1+3hGeMslUjetfBrLWdSU+K5avsXxAiJvjIJFjhZNJ3SlpUq2NoKcLtyyh6Kg5ZW7W8w3gfulFsFk1DWD22eVwspEH/jStSPk7s8TKnjRxPxSfjphPuENzCyk7S4xVIajYI6kfJkFr10pf/M77kObNSGQ99hsk2Uo+LXGWw3T3sh9c9N45wTUsDKgfSAUHvp1L9XPX0J1F0HxQp/VQ6Hbdhzlac00aC+ZsXe8E6AkQw+7mezt2ONHxzq7+EynN3Y8kI+VpHd0yodSlpo6+OR+jq9R9R1cLGT/C6F+rNm6Olwr14oKqE1qPDgOtsHipwjT6/5cy2ai4K3DQG12cEqypODiYXup3yBcRutg13o9aw5Z6uX4mexdP815WSn6b8+rQcrni5kN3/v6KJvGqI7AFzBb4J3aaehSDkQwNetmIaMJISMrN9Hk5cZB4O1jM+RtlXlY/o+gAG9y2CetIZaSLXiGd71hsWADarh5RNkTs56uLaWNCxp0N9kvjpUlDw3RwE5jHc+c6hB5ZbMgWldkKUgCKX/zgm7saiV/UPHll4Y79bHYxQjNNLRJQCOeOb8IUTi0Zq4dji+R7vil/12E/w0C6VI/vKHNoOw==|920 \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.rd b/Pages/6899a8cead694b3ba00307b6756dbd7.rd index c667b117..a8f87110 100644 --- a/Pages/6899a8cead694b3ba00307b6756dbd7.rd +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 14, - "RowCount": 6 + "RowCount": 5 } \ No newline at end of file diff --git a/Pages/个人中心/个人中心.json b/Pages/个人中心/个人中心.json new file mode 100644 index 00000000..b3fdc704 --- /dev/null +++ b/Pages/个人中心/个人中心.json @@ -0,0 +1,326 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 17, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 35, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "个人中心" + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 18.666666666666664 + } + ], + "Types": { + "Strs": [ + "Body" + ] + }, + "CellStyles": { + "1,1": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "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": {} + } +}//PWbycllxLXQkSZdG9fFRJaMHSEQQwKr5i0hf/UyGPuS5xjOuJrK8GW63qF6cZzMpHoyRDNtrYxP5qsKsySoMyJCYtkt0GNbqLvZ33KX0xHMblkaWBqivlVo2xR6upodtpbboCfwwfCNJzihkNP5MZujQeQ5nHFT5rQ8x2LNL294RGcCgboKWIH/9Tk3tco7pCChzLDneTB6eMrRKFmlS0Tyw+E3CqDcjrTzyu1npt0nIiHbr5WeAAfORPrdteyZPWlEKLB/nnhJ1p3sYSKZOf4Mv1PWx3ETIcBQNGBA7xNlPuhm2aaLHvk8+isLVzp7ZM8Y+p2gFrSqi7p7aaQ5gicD2URScuNbvDav2XUohl1oR4jdEYTHqi01IYdHiRWkNUu1fPBOZqWHwBtM+5QEipBWM5zmX9f4vAvZRf+aKi3Zo5XU4ey9KuW7yPDxqIhFWecwI+rEdFpRMl4u8bFn0eeDosTBkoKvNTsHH/c3vgtbXZHfqjOQGc2fg+SSN+MKJ5TtctM+5kbXJZeVAYqwMkxztoHgQL+Rr1vLseeGAKdfo3jGrPScWJMD7/trw5vHJY+3HmBhpQbvl6McEMniplZUqZ65EfGn44kNXlram/W71mwvR5FYEYoQHvHO8wbWIfPF6t3TFabpieIHJpAORGJjA6eFOjmxKRD7b7R0NfejX9HU4LUeXwqNw0HJLld3MGuHWVgINy32nK+IMMrYxv8FLBuMCReD3vEvHcYzIgT5RmCXfyRMWWUF8S3wswHmAR3JZ8HOnDXNC0YX7aIRZs1LHfx4O57gne0vNBXLqS3DGVrXjQD4I7uIetOhuBHHKa2YMBszLM0qgvpFeuO2SitnuQhBMkwUIR++4cIQeVYD/yzs2/3KU0R2OQUq5xPTh0g7rdU8sBRhqOXbhcXppjA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心.rd b/Pages/个人中心/个人中心.rd new file mode 100644 index 00000000..93510449 --- /dev/null +++ b/Pages/个人中心/个人中心.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 35, + "RowCount": 17 +} \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 023bac96..f1d42285 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -155,9 +155,15 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 1 + } } }, - "Count": 17, + "Count": 18, "DefaultSize": 32.0 }, "Values": { @@ -167,10 +173,12 @@ "7,1": "执行者", "9,1": "项目", "11,1": "时间", - "13,1": "任务预算工时" + "13,1": "任务预算工时", + "13,13": "剩余：0小时" }, "Formulas": { - "11,2": "C16&\",\"&J16" + "11,2": "C16&\",\"&J16", + "13,13": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")" }, "AttachInfos": { "1,1": { @@ -291,7 +299,7 @@ } } ], - "ID": "390ca23d-a543-49a8-9e98-8f56372b4a4b" + "ID": "0b24c30f-697f-49c7-91a1-99c1127f626c" }, { "CommandList": [ @@ -306,12 +314,12 @@ "BtnText": "知道了" } ], - "ID": "7aaf1c56-7985-4003-bfe8-7482431854fd" + "ID": "70f2dc21-eaee-415a-af69-99a5112c063f" } ] } ], - "ID": "72ddc6fc-8ed2-4495-aeda-61bb03b100f4" + "ID": "64b0f672-02ca-4f5a-b122-20b9c61919c7" } ] } @@ -369,7 +377,7 @@ "ShowConfirm": false } ], - "ID": "bce74ed2-98f6-4b4b-8b08-9672319d384c" + "ID": "f085d92a-1124-4bad-ac25-c040f3a7db79" } ] } @@ -473,7 +481,7 @@ "ShowConfirm": false } ], - "ID": "4ede87ab-cd93-41fc-927c-5c82758fe6e0" + "ID": "906e288c-ecef-4676-9e0c-574b8d3299ac" } ] } @@ -579,7 +587,7 @@ "ShowConfirm": false } ], - "ID": "674852fb-e38f-42db-b3a7-33b83976546c" + "ID": "dec4d1e0-2b35-4ddb-bbcc-2b74830c9cc9" } ] } @@ -616,7 +624,7 @@ "ShowConfirm": false } ], - "ID": "f4a163f3-4727-4bf3-b822-6449cee3cf1e" + "ID": "50bfaf92-4b9a-4afa-910c-e2a9cee2c617" } ] } @@ -722,7 +730,7 @@ "ShowConfirm": false } ], - "ID": "02442f29-660b-4f31-8b83-44776fddd3a3" + "ID": "0f8e595b-30dd-4efe-958a-9e3e494b216d" } ] } @@ -876,7 +884,7 @@ "ShowConfirm": false } ], - "ID": "c084ab9d-b917-4273-ae58-977f64bef54a" + "ID": "d5f123b3-78d6-45ca-98f3-bb843a465ffd" } ] } @@ -935,12 +943,92 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + }, + "Title": "计算中" + }, + { + "$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": "='任务-基本信息'!C14" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "新工时" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + }, + "Title": "计算中" + }, + { + "$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.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "bf4ecc0a-dfd9-4d8f-b07f-64041bf7b38a" + } + ] } ], - "ID": "c8766a39-a132-4b87-8222-110d61c78bfd" + "ID": "a0c39345-72b2-4fa4-b924-092d3ec59183" } ] } @@ -1014,6 +1102,12 @@ "FontSize": 13.333333333333332, "HorizontalAlignment": 5 }, + { + "Foreground": 3, + "Formatter": 6, + "TextIndent": 10, + "HorizontalAlignment": 5 + }, { "FontSize": -1.0, "Foreground": null @@ -1029,11 +1123,13 @@ "Body", "Text 1 50", "[AUTO]General", - "Left" + "Left", + "\"工时预算使用情况：\"@" ] }, "CellStyles": { "1,1": 0, + "1,17": 0, "3,0": 1, "3,1": 2, "3,2": 1, @@ -1051,6 +1147,7 @@ "3,14": 1, "3,15": 1, "3,16": 1, + "3,17": 1, "7,1": 4, "7,2": 5, "8,0": 1, @@ -1070,10 +1167,12 @@ "8,14": 1, "8,15": 1, "8,16": 1, + "8,17": 1, "9,0": 1, "9,1": 4, "9,2": 1, "9,10": 1, + "9,17": 1, "10,0": 1, "10,1": 4, "10,2": 1, @@ -1090,6 +1189,7 @@ "10,14": 1, "10,15": 1, "10,16": 1, + "10,17": 1, "11,0": 1, "11,1": 4, "11,2": 1, @@ -1107,6 +1207,7 @@ "11,14": 1, "11,15": 1, "11,16": 1, + "11,17": 1, "12,0": 1, "12,1": 2, "12,2": 1, @@ -1124,9 +1225,11 @@ "12,14": 1, "12,15": 1, "12,16": 1, + "12,17": 1, "13,0": 1, "13,1": 4, "13,2": 6, + "13,13": 7, "14,0": 1, "14,1": 4, "14,2": 1, @@ -1144,13 +1247,15 @@ "14,14": 1, "14,15": 1, "14,16": 1, + "14,17": 1, "15,0": 1, - "15,1": 7, + "15,1": 8, "15,2": 1, - "15,9": 1 + "15,9": 1, + "15,17": 1 }, "ColStyles": { - "1": 8 + "1": 9 }, "SheetStyle": { "FontFamily": 2, @@ -1167,8 +1272,9 @@ "11,2,1,15", "5,2,1,7", "7,2,1,7", - "13,2,1,15", - "7,10,1,7" + "7,10,1,7", + "13,2,1,11", + "13,13,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1254,4 +1360,4 @@ "Formula": "'任务-基本信息'!$B$16" } ] -}//4n90wdRA1AavxkzTneVX9hr0DAJFygKpzfa/tjsNEQFlJ7WGv+DpuEc4oMXJg6xZcVF/8cMx5LE01tIa0tDm91qdhA18kRW8/To9vevQMx/BwCyHariSGCSY5Fl55AS+Da3gHtGSKN+1h1+aAu9Z2rsZm3CAWQ3Ih6vy/Xmb0bZG2uGpFdA9tDQjYOd6YzeGNhi9Ypra6hi/ITQWpsWqnDll7d/ZXzCOOjCnSIg86MehfY64It8VdtBkuw1R+cn6rt7fVf4n9sb8XVDtKfEkKLbqwKIa80pV6L5o5fWv0HF+LEVQqa8dcojk9NwCdkTSMdpRrD13Rp+osbgdSou/ew4Azqksvvm6dUZS4xFqqJqP7qhw0yLPFXMo/QIWPhmfmw9IV9MGIrebqze4xbztvmYAXKKymV5e5PuPU8PSBHMomGu5qDd4msWGB0BlWjNcSkUifG9U5oDneMwZrBatgPGvJx0ap2Ky4uDgbYQ7r16Z6z6wkOz4QTpsi7A5JCOXQKecNaasu/OqfCqvdfK4aX1cAP43NRMC1ljafQPjPeBGPlvYniYucxNmQPYiA6wqte+MC54ByK8SzoeKTVNOedXj+clUVnPkcjsamDtPSftz6ygYPuoPsjhlTJ/l32qRqISeykuU+mUxQZAQksmuT3mLL3p+tblArfGEKO2E1YIryotqoWm7JUr0dFjfp0pOI4EhSNXAklK4q2jw8BeSqSjdsX30JD2kAOQ8nkE8dc9j/EeeQErm7gY1pyCQUJTfhFkHUzOipMuFKoZAEPAtvoHhixPcKjD7I8UizXMTrYpcDCHnW6X9602yZOwYJjrkonnUoqPFt/hASIKIK9yjp4nnJeRYY2uAoGEXoinnYbskvoeh8I8NXIVryboyZTVJX1gJNryo8u5SCz3kwH7S2A==|920 \ No newline at end of file +}//76Fco5jrlsNSEDyz4uozoz/bQVs+PH8B01qVSb5UmNN1465P8VvMhsgMbgIWmviDS8svp0UdcATRyhH3otAeLUe5oImMlNZUPCi1fFysBVbE6OxQByLn+I+A/6U2WXGuUY9yx6GUtaUt+i+jFYEyRY1Hk0iXwoqpni8PMCETcYyXNvfbtxBeEqXLifaRjkn1cyVXRm46QycUhcvlkTF5VUTfJexeZPuw095yoQecYQcjKUXRpS+GkMzQIKvetDsVqLK/Dzv4szZdJI2CdHqPh/JcQbvq0bnHhnkCWdAuMOmCE3e84YcDImANkuAeontXnisTeYe1qKDfi+IlRlmuzz9hnhEJwfOI5EJTfzbYng+6PcPZqtnVffWWfl7ZFBkTmJXlMDd17ibn2hB7xJUHAuzlRxrWCcP0+VXTtgvxylEkXXtmLh0UpZct90jvA1vzgHpBO6OGGlrqMk+Z+h2cpHck6roHyJJsDEGb+Dt4rrVyPGrYcTQ7VyZVvOHrdllNRq94Z1Mdj2jEPqGaCBs47TRoVnA3nAi/Pbi6ZL90Xzg/uACe0udu2I96TwiPauGGA30L9OYxvML9O0NAnoWkKnWeODFSFT8JImg3r68bujAhP+02PGSRzjR5mFQemSsmnINUE+qNdSKvHh8tdqJ0aBAmjEThayHMMzy5ybBpsHu+1RRjIYqWAxFsFqttTyT36Wfu9AJvDMwMYs8raikkBrLJ9S99qf05aJsuX/vc8ohkNuYcdAvCWvqGLxASoEQKZZToffR2im9ndWRnXU4nTw1N1RRs9d6yTe2fbC3CboI0B5aGpCjyac3g6Ky4x7sXQaLzYsK0cj8qPHQQbr7Kbde4Yz9BH2l1JnEzPzSzUKeuAeplE9TWEc/AYpcjH7dzLUD+ps0EGFTn39bZ5LdaIw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd index 56ba765e..b0641cf4 100644 --- a/Pages/任务/任务-基本信息.rd +++ b/Pages/任务/任务-基本信息.rd @@ -1,9 +1,10 @@ { "PageType": 0, - "ColumnCount": 17, + "ColumnCount": 18, "RowCount": 16, "Formulas": { - "11,2": "C16&\",\"&J16" + "11,2": "C16&\",\"&J16", + "13,13": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")" }, "CustomNames": [ { diff --git a/Pages/任务/任务成员详情.json b/Pages/任务/任务成员详情.json new file mode 100644 index 00000000..58b41151 --- /dev/null +++ b/Pages/任务/任务成员详情.json @@ -0,0 +1,891 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 13 + ], + "Count": 14, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "成员", + "4,1": "岗位", + "7,1": "任务时薪", + "11,1": "取消", + "11,12": "保存" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "4c0fb981-c8f4-4393-b11f-4bace5d3a55d" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7959c4e2-5287-422a-a944-984ea65d9bc4" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "d69f32e0-d77e-49a6-a53f-433df48efef8" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "a7df619e-acf9-4d77-9077-f6dc228dfe22" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B6" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "899016d5-3586-482c-bbff-63991f535d28" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "994d304e-6b8c-4256-985f-a4049f470071" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "a6be3c75-f356-4837-b0fb-2b3da889aa5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B3" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "3fa297b6cbb14d4d8baf053d6c983ae0", + "Comments": "任务成员，尝试从项目成员中获取默认时薪" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B6" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!项目成员.默认时薪" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B9" + }, + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "ConfirmDialogSettings": { + "Title": "确认", + "FormulaText": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前成员在项目中设置的时薪为\"&任务成员详情!项目成员.默认时薪&\"元，是否为你更新？\"" + }, + "YesButtonText": "是", + "NoButtonText": "否", + "ConfirmIcon": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目成员.默认时薪" + } + } + ] + } + ], + "ID": "28d12daa-510f-4175-9e38-306e9713e454" + } + ] + } + ], + "ID": "38ef73c4-1027-4176-85ca-4c22712b5c9e" + } + ] + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "05ce600d-de76-4e95-b1df-c7ce3c6fa3c4" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "34ac3f26-035f-473a-916b-75b69be02c47" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "69a15af3-6c19-479c-86fb-65e3ac40a238" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "b4e34ac6-32f9-47fc-85da-15f532bcccc5" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + } + }, + "11,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "11,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!任务ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "0147622e-6eba-49a4-b9d0-eb8d8c15b8b2" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + } + ], + "RequestAsync": true, + "CheckDataValidation": false + } + ], + "ID": "69963d47-ad9f-41c0-b2e8-f70376c14fee" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "ShowConfirm": false + } + ], + "ID": "41415866-c834-45ef-8b3d-b03ffccdf3c9" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!ID" + } + } + ] + } + ], + "ID": "bbb3f391-8983-49a5-a992-0af1964d4f79" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目和任务" + } + ], + "ID": "96df2c43-4aba-4ec0-9024-47dad343ee46" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "13,0": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "250b5313-3bbd-41bd-8609-28bb67513d07" + } + }, + "13,4": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "d2e27dcb-2fc0-4a6e-b7ff-414bab3256f7" + } + }, + "13,7": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "9cd4fbc1-41d9-4383-9c0f-ae51b2b45d86" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "BorderBottom": 0 + }, + { + "Background": 3, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + }, + { + "Background": 3, + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "FontSize": -1.0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 2 + }, + { + "Color": 4 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "4,0": 1, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,15": 1, + "5,0": 1, + "5,1": 1, + "5,15": 1, + "6,0": 1, + "6,1": 1, + "6,2": 1, + "6,3": 1, + "6,4": 1, + "6,5": 1, + "6,6": 1, + "6,7": 1, + "6,8": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "7,0": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "8,0": 1, + "8,1": 1, + "8,15": 1, + "9,1": 2, + "9,2": 2, + "9,3": 2, + "9,4": 2, + "9,5": 2, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, + "11,1": 0, + "11,2": 1, + "11,3": 1, + "11,12": 0, + "11,13": 1, + "11,14": 1, + "13,0": 3, + "13,1": 4, + "13,2": 4, + "13,3": 5, + "13,4": 6, + "13,5": 4, + "13,6": 5, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 7, + "13,11": 7, + "13,12": 7, + "13,13": 7, + "13,14": 7 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "13,0,1,4", + "11,1,1,3", + "2,1,1,14", + "8,1,1,14", + "11,12,1,3", + "13,7,1,3", + "13,4,1,3", + "5,1,1,14" + ], + "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": [], + "RelatedDataTableName": "任务成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "任务成员详情!$A$14" + }, + { + "Name": "ID", + "Formula": "任务成员详情!$H$14" + }, + { + "Name": "任务ID", + "Formula": "任务成员详情!$E$14" + }, + { + "Name": "项目成员默认时薪", + "Formula": "任务成员详情!$K$14" + }, + { + "Name": "人员全局默认时薪", + "Formula": "任务成员详情!$N$14" + } + ] +}//jT54Y4NuMusd3+RJLzd/s9+8sIZQ9CpPrPeVjJTtnAYfa578UOGmWfRZmoGGWCnH+Rd7dLgL7JfVp/XzX3QolZpIvVeLaDAI3r2me3vgp9ktoyQTY16BltP5mzFntpHAL3A3h6mlDLO7atCgQwwtCT5D2SZD0WTLhk2V/fLJA0Mq4+aokITQ7omPBq6R7hTitOnYnqf+whOwSTFiNFJRDiQR5eF31GFe76HMenrHF7Qd53ldzENCbGQu2/iasrtfi2H22B8RLMr6EfZcZzoGbPbDkLW2nc3QHsdMThTqkj5kj2XzSUc8tPusD/de7F0byl1hcIP6Aan+mKH+olqXb2TF36iYtTWfkui1L9HYS/hbwf/i05IYorbaXsU9LyHn/vII6G1pUUKzJZtwZ4AXuyGnT2dpA00KCjUBbOXPULIPGNCPYgsBImuzqgRsJe7tNSR/lcGiDVeQYekCb6lkEAqK1xS5PFFKyW24XYDRSn0r5kqJaqdnci4Macx0vxnehbjog6QSM5KG5CqBbEjj/vGLHreIgnU2dtvlR1WJl8wdOvclRLxOM30CdWpuvKr6Zc1YlbK1cO1dnaEXDaXl4WbSMIlSGkwlDwF89t87TwSv5vTgm2OgUcvCzTKAedfSB+FPZMT95CBzsY7CE2sevTJ+TQnWQgYYpJtIhtDx/EKpMWtEGxldk+UeURN+yBUA8IxfCTohO7d3EC3mRELU/gUGK9UxDR9mVHvOkf70AdPURt8G2YbefNv2xObdqD40CXpDhl5xw5kpdTfr5DUsPVG9M6r2ztbH08RF6dxQCfA1tfyVv1YEKOX4zyMK8nCPHC8/094T5+xlYawAMSwXafI/bvM+XxxhPC6XmSiKTfbUnXcAfeeX+4jBjivzvicf0Ut198wauMCmNh2pSBUQrQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务成员详情.rd b/Pages/任务/任务成员详情.rd new file mode 100644 index 00000000..cc833c73 --- /dev/null +++ b/Pages/任务/任务成员详情.rd @@ -0,0 +1,27 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 14, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "任务成员详情!$A$14" + }, + { + "Name": "ID", + "Formula": "任务成员详情!$H$14" + }, + { + "Name": "任务ID", + "Formula": "任务成员详情!$E$14" + }, + { + "Name": "项目成员默认时薪", + "Formula": "任务成员详情!$K$14" + }, + { + "Name": "人员全局默认时薪", + "Formula": "任务成员详情!$N$14" + } + ] +} \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 6e8c56bf..7a792b81 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -244,7 +244,6 @@ "3,1": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -284,41 +283,25 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务成员表", + "TableName": "用户信息视图", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "ID", - "GUID": "15433ad7-1dde-4e68-ba5d-d573699d7843" + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7edd7924-e06c-4028-97bc-14789459e5e3" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "408bf03a-b384-448e-82b5-f72b6e32dac9", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "6d7908c4-432f-435c-9d5f-74cb2be2e596" }, "ColumnName": "label" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "f25dfd58-1996-465a-8964-f9240fe2e490" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } - }, "CustomColumns": [] }, "placeholder": "请选择", @@ -446,105 +429,43 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B8" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员是否存在", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "c350559c-7b23-47d9-ad05-a1e5b373b4f4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "3b409e62-a534-42c1-93fa-635a22babaf7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$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": "=新增报工!结束日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B4" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B12" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "进展内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B16" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时类型", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!L4" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "指定时薪单价" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" + "ID": "919f526a2a1f45069c0f7f1d65b3d5d7" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -556,7 +477,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=新增报工!code" + "SerializeProperty": "=成员是否存在" } ] }, @@ -564,33 +485,418 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - } + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "是否继续", + "AdvancedSettings": {} }, { - "$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": "=是否继续" + } + ] + }, + "value": "confirm" + }, + "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": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$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": "=新增报工!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "进展内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!L4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$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.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "68f02e54-b6cd-4d0a-8f78-7b6427c4e1d7" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "e2add62a-d49b-439a-a985-cc4893a7ad44" + } + ] + } + ], + "ID": "ec972c3c-db39-4b76-bd72-1a428a580eb2" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "用户已取消" + } + ], + "ID": "88f2d0a5-24e0-4f4c-b275-b600165e789d" + } + ] + } + ], + "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": "=新增报工!B4" + }, + "TargetCell": { + "SerializeProperty": "=任务成员详情!B3" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "ID": "01c0a797-8482-462c-a16d-aa0b8be107a4" + } + ] } ], - "ID": "8d435728-6ae1-47e1-bcd6-1b2806822f55" + "ID": "d5e4e0c9-47f9-49ec-b23b-46903c57799b" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" + "SerializeProperty": "=新增报工!B8" }, - "BtnText": "知道了" + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$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": "=新增报工!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "进展内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!L4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$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.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "9b3a6302-0d35-4748-9aaf-94b4b27364d5" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "53f0f680-4199-4043-b761-0d9a2efd47fa" + } + ] } ], - "ID": "cd24725f-96d1-4410-ab82-c34d347cb5cf" + "ID": "4a746207-7a31-4c5e-83ff-8b97257135bd" } ] } @@ -943,4 +1249,4 @@ "Formula": "新增报工!$L$4" } ] -}//9elmvJlwkB+qo5/tOS4CUPD+W7t5vpwJOSD0GDiCROtb8qU3oU/ZKvXsPSZBz8u6nsbz0VNtydjQHa/78qe3TlHXMFEOm3tL5zB5vcVoTffaRixyVHDnqWPF05DYg6PJuTUSO2UMoT2RWwr9r9O06oJnKNHVQptfvq5WZr4mLJApoc4bqztmWnerTP4Or9SqdmLIBMqXvNWPsWvrzJLA70/PbYy7nNXuR2sbucMmM2hJ1dY9nvM1oxCFvcKZJ1dX8iYjZR0iHc9c43ZqJFvX2JF+ka8xlRprFQy3XbL+VcT8lzqv9JiHc6LnmBQnk4DCRPRj9M57aY0TwT6fXMJqCw5b0jm0eAEOBd8xuS8WIZUssy09NTB/iG3JdV5MVyT9ZAqUYvJVJRN1yJ0XUVhByfWvoNVSGqdoVmXuhf7XP00M9jg+JJRO1vV8MIwuSW1dwdMRB3abGPJM8rYEEvP14wjInafsFURtvYMi/JRkf5RqvTFXddYGkQ9hCBAobwZnUEz98wDOdA4sS4bE4r/MBUbn4l7Y15BP5bAO3ipSJTkD0OgGe1cpvopBN/ls94Zpjp45F8+lzfHjX63OZMygukAUa7DjbvX48B7Hb83jK+pQC5V+VsYzYEzMwuoM2XPojsA+lL2WuspEAGc5VTFXjch/jYYy6IWWUSsKbiNLS6y25ie7VOfrbpmO0UWrdAWvTuR7A3nkQHjF9qM1jmIN3lOjPnqdA4gsR07QyOoSyYD+wzcoYAJE3mQMphwuy86GkBZoOkLWBhwpqdw4T10LaoajlTurnqy5gCGvzC+VjblWs19N0bH3ESvKRZs55/Emwt2sDBHzwVB7BD+aoJ242mcgKWrjbDSM44KE1JmxFYZhLdSI7cJZ81zAP9HzQLJv6YYUpgkmhNuysHPiR69how==|920 \ No newline at end of file +}///7asOd5dapnuBEjGKSW0wRBUDvpYEXUr4hjlV0j6Qd4U5Pxi7KcP1ObEqkTq97eK73H7pxt7nA3867sawCK8kQxRJvzqwVuzodBvwJysTZ9hacCDn4UDvE4539GIa69MiFPRDmEVIVcTdpi8lAarPN+VBPyH0wkOnVYWW/yQNNgLpneOTKsFFSk2a6/7IsvchYSNxveJfVoz2w4KXg67lBEkmGi37IIyNEBJ+eTNJSVDkrNfRkk79L/+vP18qWr6klToD6/FPxCA9SJGpiPYjvuDVjFkYBqNn/V9cdup9QWHZ6oLSXFQZ/qAozvfwj6cpElbL5ui6p75qr/lVBweYGT10AQPmXuNxPtX46nKM3FWSrUvd71Av+Z9qEZCF4gVZKHMxPo4WadYJXdazQ+TjrZKId/NBdZeKdlXVB4kRjhmGXSKZI8yibIsZ8MtnwlGs9YqOSZkWkeHm/GtXp9AF05b4CmzgBuzKwxFNXlTqtVkcIDjyRL6/ZYb5ul6ZhJ03naXRofaFWC4tOX0nedDGs/Jyf9rua4sb/5fKoVstmBITh6ogokAnuX82gs+S3sKBMM5E88NnJ3flkmhf8Z7Cwb2QXeV37VMqHBuLn12HC3N3QHyGv5xtYDMYEAT5P2B+8teyUEjFFotm6UaNYrZ/wc2hvgdioJLcQ3+LBF5/S8zNgcwRgktJIBqeuFMyM4LWznq4ek+7ERWF827vzPVSJHbLpa9oRRWMUKcaH1oWxzjvF9KI9kybIanWA0jKbWOtmarM6XuqoC9MqN6jUE5LKujRQQWhNmZ56zGuUrZ7jlvvkQWkcoFsY8MXbuQprUm2CLD/JtnbcwaA8/Z+MYuP9oETKC7cKoTQ+bDSoFk04dnfOmyv5daUZqGg5oWLXO73SpS5+TJ5bjL5DgzzVEMKA==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 26d99d41..7c16956e 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -228,23 +228,22 @@ "Values": { "1,21": "任务说明", "1,37": "编辑", - "5,1": "工时核算方式", - "5,5": 1, - "8,1": "执行人", - "8,9": "计划日期", - "9,1": "%CurrentUser.UserName%", + "5,1": "任务执行人", + "5,5": "%CurrentUser.UserName%", + "8,1": "计划日期", "11,1": "所属项目", "11,9": "分组", "11,21": "备注", "11,37": "编辑", "14,1": "任务类型", "14,9": "任务版本", - "17,1": "参与人", + "17,1": "预算工时", "21,32": "取消", "21,36": "提交" }, "Formulas": { - "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,1": "\"预算\"&F6&\"工时\"" }, "AttachInfos": { "1,37": { @@ -313,31 +312,6 @@ } }, "5,5": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "PrimaryColor": "Accent 1 0", - "SecondaryColor": "Background 1 0", - "CellDefaultValue": 1, - "IsBounding": true, - "DataSource": "工时核定方式", - "ValueColumnBindingInfo": { - "TableName": "工时核定方式", - "ColumnName": "ID", - "GUID": "fcf51035-9f55-4d46-85c3-86e6fe9e33e1" - }, - "DisplayColumnBindingInfo": { - "TableName": "工时核定方式", - "ColumnName": "核定方式", - "GUID": "b29ddaca-6a1d-46a8-a4c8-c92acd7a092d" - } - }, - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - "9,1": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -411,7 +385,7 @@ "noMatchText": "无匹配数据" } }, - "9,9": { + "9,1": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [], @@ -798,7 +772,7 @@ }, "18,1": { "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", + "$type": "ElementUI.InputNumberCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -814,61 +788,15 @@ ] } ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "2c2f9576-3f47-4755-aa8d-51deb10d2a8d" - }, - "ColumnName": "value" - }, - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "962a03a2-2603-4861-b3a0-a44974d69a19" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true + "min": "0", + "step": 1, + "placeholder": "请输入工时(h)", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 1, + "CompareParamType": 6, + "FirstParamValue": "0" } }, "21,32": { @@ -896,7 +824,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!J10" + "SerializeProperty": "=新增任务!B10" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -942,7 +870,7 @@ "ParamName": "执行人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!B10" + "SerializeProperty": "=新增任务!F6" } }, { @@ -987,7 +915,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "参与人", + "ParamName": "预算工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增任务!B19" @@ -1050,7 +978,7 @@ "ReloadData": true } ], - "ID": "142d4cf6-006d-4abf-bf98-12a9d05428f0" + "ID": "1db9310d-e162-45b0-828f-d115f8138fef" }, { "CommandList": [ @@ -1065,7 +993,7 @@ "BtnText": "知道了" } ], - "ID": "c1616364-a718-4f04-a20b-080406f812c7" + "ID": "c2cda3fe-b5a2-40e0-bddd-38ca25da6d85" } ] } @@ -1140,12 +1068,6 @@ "FontSize": 13.333333333333332, "BorderBottom": 0 }, - { - "Foreground": 3 - }, - { - "Foreground": 6 - }, { "BorderBottom": 0, "BorderLeft": 0 @@ -1158,6 +1080,9 @@ "FontFamily": 2, "FontSize": 13.333333333333332, "Formatter": 4 + }, + { + "Background": 7 } ], "Types": { @@ -1168,7 +1093,8 @@ "Text 1 50", "[AUTO]General", "Center", - "black" + "black", + "#FFFFFF00" ], "Borders": [ { @@ -1267,8 +1193,7 @@ "7,19": 1, "7,21": 8, "7,38": 1, - "8,1": 14, - "8,9": 9, + "8,1": 9, "8,10": 3, "8,11": 3, "8,12": 3, @@ -1277,10 +1202,9 @@ "8,19": 1, "8,21": 8, "8,38": 1, - "9,1": 15, - "9,9": 10, + "9,1": 10, "9,19": 1, - "9,21": 16, + "9,21": 14, "9,22": 12, "9,23": 12, "9,24": 12, @@ -1297,7 +1221,7 @@ "9,35": 12, "9,36": 12, "9,37": 12, - "9,38": 17, + "9,38": 15, "10,19": 1, "11,1": 9, "11,2": 3, @@ -1398,7 +1322,7 @@ "17,38": 1, "18,1": 10, "18,19": 1, - "18,21": 16, + "18,21": 14, "18,22": 12, "18,23": 12, "18,24": 12, @@ -1415,7 +1339,7 @@ "18,35": 12, "18,36": 12, "18,37": 12, - "18,38": 17, + "18,38": 15, "19,1": 13, "19,2": 13, "19,3": 13, @@ -1521,13 +1445,14 @@ "21,29": 10, "21,30": 10, "21,31": 10, - "21,32": 18, + "21,32": 16, "21,33": 3, "21,34": 3, "21,35": 3, - "21,36": 18, + "21,36": 16, "21,37": 3, - "21,38": 3 + "21,38": 3, + "23,1": 17 }, "SheetStyle": { "FontFamily": 2, @@ -1535,25 +1460,24 @@ } }, "Spans": [ - "9,1,1,6", - "9,9,1,10", "3,1,1,18", "12,1,1,6", "12,9,1,10", "15,1,1,6", "15,9,1,10", - "18,1,1,18", "23,1,1,3", "1,1,1,18", "5,1,1,3", - "5,5,1,14", "1,37,1,2", "11,37,1,2", "19,19,1,2", "21,36,1,3", "21,32,1,3", "3,21,7,18", - "12,21,7,18" + "12,21,7,18", + "18,1,1,18", + "5,5,1,14", + "9,1,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1589,4 +1513,4 @@ "Formula": "新增任务!$B$13" } ] -}//mv5uDStCe0lF/IolkkIEmkjVIcAFCi6DdCIeafzYwbxVp2cDrbc4e1/HYpqNLVhJxdPaXrobndSwGO+b3XxY5+hrNvJY6TrSAZKG+aKsdMviS4tACKkf0L86ER6++l5Gq4CpD8LKbvYABRAVPZtjy8TQEiEJZiZygc12C+xsr5aF83mkaaWHkcF/EL7AAb5dFn/kJRgPgBSRDtro+8RieTtjhPDw8QycRsh2eHiPtxj7KSIrnIZzK3Jw/VTVyTG6Ks7YhOaGWsySnzGOW07KODdmfZD8Hwoc79dhGn2BRzCwyFybCbujx2hIfjGNa3PfoSnElrc6gxqm9a6sXYjmZVr7ZdoFUly563hOKqIcRTtbY+q+xmzHEpZl62Tp9cbY6xS2q1ibbyACAAkzmXeDi/wvI9dDa1h5IaHKHwJlFf9lQL3omBIh3OiV/dxCMDZrsBpdaENSIAage+UXxcQuYygVbcNXreaIQxZJ+qhqMKUrjeiUWEJeBk2IrKgVPFVRs53tFyHKxoUssCegaskrsHmCmXWV1NM8G4Gl+UecO2pPeSsnOHexAlWx9VlvvNtSvd2HUqlxwQKo/XkNvKq9p7ta3qGGDsQPuDhPtIVBT+5d4JO/1zHh/qIlLHI5ZrLDvteTuoQ3AvdCu8umocp5VHKK0lRfwvPC8cVN6GSFYvzFHi8ZYjmvjqEqIOBo7Q150fQVd6lH5nT3RSUq/gX4Sb8aIWP7wDPtxCA8CnugBMs+6S25lz7QFtpaVYrIwAJjxFx5Zfritx4Qd1w2JtjU03+SthArZvn5POqliCaKEzWPMW3kDdQpkpI0kSTIbFo5axIwWrdBlhWR6QopUTO4uZqlNWTPsot3f/4HI7hSNNv6YD3adQzpJo9GmsskbsfGuy0nQ1tWGchTRV+HUbbKMg==|920 \ No newline at end of file +}//Mp41C+8oc/O+ARIn3ih0GMbJpbI3Hznhl5igr9t8uhp75kxzyn6bXI856NHy072UaiXCfkj9IYzYes9aoco5SCL+fr+E96yBRJ3k0Psj0Yl1Nhi0TTlwM5WGU+lLYey4oROnSEbMwHphouzJ56jM1OmFYaB6SN7Z4eoA96sGJYcVlrncciqLpdddwWs8iACqr3u6PSEapeUAMc2coI+7wzUHAydTJlvrd77JVspi57/jU36qWf2GX3YEPzXMYun/yAOZrJ5IGd5tfpPcohO2WxyJBD7M7XZ+4EAaTzTeceLXju8JQ3Jh8Agwzm/je9TwG1VqOMh9+zFnPnGh4weFg8xC132x4VGFVTJJpRIVute/3Y1MVlt3P/KU/loCbjOODVKHWFBI7zV0sxMYoiRPX58HLP0UKpqZUn7ve9rydsFOBdT3+45mpq1BYFBMQDOvXBuwrluUpj9rlx3y9/f2d/gUc0Y2C6eXlXUutpTlMZxbJNLfEojXIdO8g+u67A9HeSxM/XsIzhg42ahEJNxYBAaDtqnlyV5o/g7wGOq12M8EjUI2B8ornM61tBhYjQhP6ZCzp0pMKtlwp+ShIbTrXynX6vrk0IqI6cr0Q2NhFIq+xlRCu1EwmpcFg948Pwo7K/5uhjFQHwcqjSfFY4BT+RjeSrP49A3Z7GHbya4ktFcbSaY/A6bVdkeKSgy/5EhVwYw2JdjIjURP17pNnGRdXrvQVkFbKKKdHvvy3+FDhfRtZp7W6Xs+nt+2ltn4pFIOgKC3dWT8d8420V9ztEyZckYD8UpKzeq8e+LW6ZmLwhDDkigs87K29Q8xuu6HGb8Qo7o51IY/XkRoiHWjGtJWzKeXsKV2gAzc88NTETynawkSFL5vM5IrOuU94AmSU1zyrcpmw9nb9cu0kC209lG8ig==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index 8f54c25a..3866b4da 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -3,7 +3,8 @@ "ColumnCount": 40, "RowCount": 24, "Formulas": { - "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,1": "\"预算\"&F6&\"工时\"" }, "CustomNames": [ { diff --git a/Pages/内建页面/FGC_修改用户信息.json b/Pages/内建页面/FGC_修改用户信息.json index 40aa27cb..a1e0a4ca 100644 --- a/Pages/内建页面/FGC_修改用户信息.json +++ b/Pages/内建页面/FGC_修改用户信息.json @@ -1,48 +1,135 @@ { "Rows": { "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, - "28": { + "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } } }, - "Count": 30 + "Count": 23, + "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -54,185 +141,192 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "39": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -244,186 +338,44 @@ }, "40": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "43": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "44": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "45": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "46": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "47": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "48": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "49": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "50": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "51": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "52": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "53": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } } }, - "Count": 55 + "Count": 41, + "DefaultSize": 32.0 }, "Values": { - "4,20": "修改用户信息", - "13,20": "*", - "13,21": "显示名", - "17,20": "*", - "17,21": "电子邮箱", - "22,20": "保存", - "25,20": "取消" + "1,1": "个人中心", + "4,9": "基本信息", + "4,28": "保存", + "6,16": "姓名", + "9,16": "邮箱", + "13,9": "其他配置", + "13,28": "保存", + "15,16": "最大日负荷(小时)", + "16,16": "%CurrentUser.负荷%", + "18,16": "默认时薪", + "19,16": "%CurrentUser.默认时薪%" }, "AttachInfos": { - "7,25": { + "4,28": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "保存", + "AutoExecute": true, + "TemplateKey": "链接样式", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 12.0, + "ForguncyAttribute": "ChangeProfile_Button" + } + }, + "6,9": { "CellType": { "$type": "Forguncy.UploadImageCellType, ServerDesignerCommon", "UploadImageLimit": { @@ -438,7 +390,7 @@ "ForguncyAttribute": "ChangeProfile_Picture" } }, - "14,20": { + "7,16": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", "SavedValidators": [ @@ -454,7 +406,7 @@ "IgnoreBlank": false } }, - "18,20": { + "10,16": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", "SavedValidators": [ @@ -470,26 +422,124 @@ "IgnoreBlank": false } }, - "22,20": { + "13,28": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "保存", - "AutoExecute": true, - "TemplateKey": "_RS_Main1", - "ForguncyAttribute": "ChangeProfile_Button" - } - }, - "25,20": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "NavigateType": "back" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!Q17" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!Q20" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!msg" + } } ], - "Text": "取消", - "TemplateKey": "_RS_Main" + "Text": "保存", + "TemplateKey": "链接样式", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 12.0 + } + }, + "16,16": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.负荷%", + "min": 0, + "max": "24", + "step": 1, + "placeholder": "请填写小时", + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "19,16": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.默认时薪%", + "min": 0, + "max": "24", + "step": 1, + "placeholder": "请填写元", + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false } } }, @@ -497,7 +547,7 @@ "Styles": [ { "FontFamily": 0, - "FontSize": 24.0, + "FontSize": 18.666666666666664, "FontWeight": 1, "Foreground": 2, "Underline": false, @@ -505,35 +555,60 @@ }, { "FontFamily": 0, - "Foreground": 3, - "HorizontalAlignment": 4, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "FontSize": 14.666666666666666, - "Foreground": 2, - "HorizontalAlignment": 4, + "Underline": false, + "Strikethrough": false, + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "Formatter": 5, - "HorizontalAlignment": 6, + "FontSize": 13.333333333333332, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "Foreground": 3, + "FontSize": 13.333333333333332, + "Foreground": 4, + "HorizontalAlignment": 5, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "HorizontalAlignment": 6, + "Formatter": 6, + "HorizontalAlignment": 7, + "Underline": false, + "Strikethrough": false + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, + "Formatter": 8, + "HorizontalAlignment": 5, + "Underline": false, + "Strikethrough": false + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, + "Formatter": 8, "Underline": false, "Strikethrough": false } @@ -543,21 +618,474 @@ "Body", "Bold", "Text 1 25", - "#FFFF0000", + "Background 2 0", + "Text 1 50", "Left", "@", - "Center" + "Center", + "[AUTO]General" + ], + "Borders": [ + { + "Color": 3 + } ] }, "CellStyles": { - "4,20": 0, + "1,1": 0, + "2,0": 1, + "2,1": 2, + "2,2": 2, + "2,3": 2, + "2,4": 2, + "2,5": 2, + "2,6": 2, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,10": 2, + "2,11": 2, + "2,12": 2, + "2,13": 2, + "2,14": 2, + "2,15": 2, + "2,16": 2, + "2,17": 2, + "2,18": 2, + "2,19": 2, + "2,20": 2, + "2,21": 2, + "2,22": 2, + "2,23": 2, + "2,24": 2, + "2,25": 2, + "2,26": 2, + "2,27": 2, + "2,28": 2, + "2,29": 2, + "2,30": 2, + "2,31": 2, + "2,32": 2, + "2,33": 2, + "2,34": 2, + "2,35": 2, + "2,36": 2, + "2,37": 2, + "2,38": 2, + "2,39": 2, + "2,40": 1, + "3,0": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, + "3,31": 1, + "3,32": 1, + "3,33": 1, + "3,34": 1, + "3,35": 1, + "3,36": 1, + "3,37": 1, + "3,38": 1, + "3,39": 1, + "3,40": 1, + "4,9": 3, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, + "4,15": 1, + "4,16": 1, + "4,17": 1, + "4,18": 1, + "4,19": 1, + "4,20": 1, + "4,21": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 4, + "4,29": 1, + "4,30": 1, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 1, + "5,21": 1, + "5,22": 1, + "5,23": 1, + "5,24": 1, + "5,25": 1, + "5,26": 1, + "5,27": 1, + "5,28": 1, + "5,29": 1, + "5,30": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "6,16": 5, + "6,17": 1, + "6,18": 1, + "6,19": 1, + "6,20": 1, + "6,21": 1, + "6,22": 1, + "6,23": 1, + "6,24": 1, + "6,25": 1, + "6,26": 1, + "6,27": 1, + "6,28": 1, + "6,29": 1, + "6,30": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "7,16": 6, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "7,23": 1, + "7,24": 1, + "7,25": 1, + "7,26": 1, + "7,27": 1, + "7,28": 1, + "7,29": 1, + "7,30": 1, + "8,9": 1, + "8,10": 1, + "8,11": 1, + "8,12": 1, + "8,13": 1, + "8,14": 1, + "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 1, + "8,19": 1, + "8,20": 1, + "8,21": 1, + "8,22": 1, + "8,23": 1, + "8,24": 1, + "8,25": 1, + "8,26": 1, + "8,27": 1, + "8,28": 1, + "8,29": 1, + "8,30": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,16": 7, + "9,17": 1, + "9,18": 1, + "9,19": 1, + "9,20": 1, + "9,21": 1, + "9,22": 1, + "9,23": 1, + "9,24": 1, + "9,25": 1, + "9,26": 1, + "9,27": 1, + "9,28": 1, + "9,29": 1, + "9,30": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "10,16": 6, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 1, + "10,25": 1, + "10,26": 1, + "10,27": 1, + "10,28": 1, + "10,29": 1, + "10,30": 1, + "11,1": 2, + "11,2": 2, + "11,3": 2, + "11,4": 2, + "11,5": 2, + "11,6": 2, + "11,7": 2, + "11,8": 2, + "11,9": 2, + "11,10": 2, + "11,11": 2, + "11,12": 2, + "11,13": 2, + "11,14": 2, + "11,15": 2, + "11,16": 2, + "11,17": 2, + "11,18": 2, + "11,19": 2, + "11,20": 2, + "11,21": 2, + "11,22": 2, + "11,23": 2, + "11,24": 2, + "11,25": 2, + "11,26": 2, + "11,27": 2, + "11,28": 2, + "11,29": 2, + "11,30": 2, + "11,31": 8, + "11,32": 8, + "11,33": 8, + "11,34": 8, + "11,35": 8, + "11,36": 8, + "11,37": 8, + "11,38": 8, + "11,39": 8, + "12,1": 1, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 1, + "12,15": 1, + "12,16": 1, + "12,17": 1, + "12,18": 1, + "12,19": 1, + "12,20": 1, + "12,21": 1, + "12,22": 1, + "12,23": 1, + "12,24": 1, + "12,25": 1, + "12,26": 1, + "12,27": 1, + "12,28": 1, + "12,29": 1, + "12,30": 1, + "13,9": 9, + "13,10": 1, + "13,11": 1, + "13,12": 1, + "13,13": 1, + "13,14": 1, + "13,15": 1, + "13,16": 1, + "13,17": 1, + "13,18": 1, + "13,19": 1, "13,20": 1, - "13,21": 2, - "14,20": 3, - "17,20": 4, - "17,21": 2, - "18,20": 3, - "25,20": 5 + "13,21": 1, + "13,22": 1, + "13,23": 1, + "13,24": 1, + "13,25": 1, + "13,26": 1, + "13,27": 1, + "13,28": 4, + "13,29": 1, + "13,30": 1, + "14,9": 1, + "14,10": 1, + "14,11": 1, + "14,12": 1, + "14,13": 1, + "14,14": 1, + "14,15": 1, + "14,16": 1, + "14,17": 1, + "14,18": 1, + "14,19": 1, + "14,20": 1, + "14,21": 1, + "14,22": 1, + "14,23": 1, + "14,24": 1, + "14,25": 1, + "14,26": 1, + "14,27": 1, + "14,28": 1, + "14,29": 1, + "14,30": 1, + "15,9": 1, + "15,10": 1, + "15,11": 1, + "15,12": 1, + "15,13": 1, + "15,14": 1, + "15,15": 1, + "15,16": 9, + "15,17": 1, + "15,18": 1, + "15,19": 1, + "15,20": 1, + "15,21": 1, + "15,22": 1, + "15,23": 1, + "15,24": 1, + "15,25": 1, + "15,26": 1, + "15,27": 1, + "15,28": 1, + "15,29": 1, + "15,30": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,14": 1, + "16,15": 1, + "16,16": 1, + "17,9": 1, + "17,10": 1, + "17,11": 1, + "17,12": 1, + "17,13": 1, + "17,14": 1, + "17,15": 1, + "17,16": 1, + "17,17": 1, + "17,18": 1, + "17,19": 1, + "17,20": 1, + "17,21": 1, + "17,22": 1, + "17,23": 1, + "17,24": 1, + "17,25": 1, + "17,26": 1, + "17,27": 1, + "17,28": 1, + "17,29": 1, + "17,30": 1, + "18,0": 1, + "18,9": 1, + "18,10": 1, + "18,11": 1, + "18,12": 1, + "18,13": 1, + "18,14": 1, + "18,15": 1, + "18,16": 9, + "18,17": 1, + "18,18": 1, + "18,19": 1, + "18,20": 1, + "18,21": 1, + "18,22": 1, + "18,23": 1, + "18,24": 1, + "18,25": 1, + "18,26": 1, + "18,27": 1, + "18,28": 1, + "18,29": 1, + "18,30": 1, + "18,31": 1, + "18,32": 1, + "18,33": 1, + "18,34": 1, + "18,35": 1, + "18,36": 1, + "18,37": 1, + "18,38": 1, + "18,39": 1, + "18,40": 1, + "19,0": 1, + "19,9": 1, + "19,10": 1, + "19,11": 1, + "19,12": 1, + "19,13": 1, + "19,14": 1, + "19,15": 1, + "19,16": 1, + "19,31": 1, + "19,32": 1, + "19,33": 1, + "19,34": 1, + "19,35": 1, + "19,36": 1, + "19,37": 1, + "19,38": 1, + "19,39": 1, + "19,40": 1 }, "SheetStyle": { "FontFamily": 0, @@ -566,15 +1094,18 @@ } }, "Spans": [ - "14,20,2,15", - "18,20,2,15", - "22,20,2,15", - "25,20,1,15", - "7,25,5,6", - "4,20,2,15" + "6,9,5,6", + "7,16,1,15", + "10,16,1,15", + "4,28,1,3", + "13,28,1,3", + "1,1,1,7", + "19,16,1,15", + "16,16,1,15" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", "MobilePageName": "FGC_修改用户信息_手机版", "Title": "修改用户信息", "RowBreakLines": [], @@ -584,23 +1115,5 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "BackgroundPictures": [ - { - "Name": "BackgroundPicture3", - "DisplayName": "背景图1", - "StyleInfo": { - "CornerRadius": 20.0, - "Fill": "#FFF6F6F8", - "StrokeDashType": 8, - "Stroke": "Background 1 -25", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "340,40", - "Size": "400,540", - "BoxShadowString": "0 0 0 5 #18000000" - } - ] -}//joap596P2warTEIZ0oavzC+Y8d5yH0fYJ1vIOJxqNKCXb2ee29TRSVfGhYNsHLTi1m5qBYuUlRIBZanJqp7OOBluS9G0Lsy40e057dA6ONH3I4ZWo9OkBokBUCCjLteh77MklILpxnHgV5UnU9Bd5s056110SFErZWf/wiQTMfOInEFDXuHtgDou5QzE5wddn4RbMh87gHvjyHeWUnarY95O5GZIy5JQsF1vrpuImJbKF6ABvpHYeYLbgaKTz55szJB00loSPYAHRKYv7q1P747Jhj0NFupGBE7B7Ee8awoPKjm//pJ2OAZHsxDqoVU85GYE3kSNQAtJioAtJOVXvdcrSwRpf5PCVyBEnpyDmwWRN08A0SwRXLoJ9+IXV24lj5nNEAL9avHTtkQ2w3PYFIX7Jy/9IYZXGX+ZLlm8qD/quFcoLNdov3EGLw7dqb2KENCmrwymQm+9pJes01+Dgc7eKHO7cAfpF4qcCQ6p0p8iPly8eGzXlxwdQbTmdRsle2e0BnD9a23/ZOBEQYubtq0Sip2rPDwWFhEN88CdvdpjhEjUIgGq/vL3lp7bFDZ2SBnVrvzXisbCKkRj5TxeMJ0NuGAI/7pG/TDau5h8xzzbN9Mixul0FYPFdHr/3ROyavehPxMltaEBBsDBpeNk1dhrpO0kWlalLoeyKzxlg8RZLGZw4RwqouBJgyJ1GU/nvxYCA3fCL1EIB2yIwNA6z4DmIh0Mhh2vgpLCAAf/Wbq5qWS7oBfwZIFJm09gCXeXoQ58YFtKg7WUTljSo1SFygISdxdQAz1bC2HmudvOpnd3BGBLqOz1mtncZHzFxrDHNukHaU2+5TIievE/OeSiJJUNQNHlPG6W0MmeLLe9h3MnR1aOmq9TMWieZLKv1/yasXDv1YdtZeAS238PGZQnXQ==|920 \ No newline at end of file + } +}//hlQ2AB0MoY5D/73UbYzPD53GmKD8xEliUWbHqttW8tgM2b9v+Bv/GE1P+kPUq7pKad9/h0yx2sO8aOTVCDTSNyAXdr0/KB/NS5qar5+2MYey5efpZOJhot80gE8gyZUuywkUl3qjCV1sP4kL098NyelX9HC98UppZKUNrSYjsDoHR4n5g5XJzs3c+ogqzkLzdiXyNfn0kMzAwE/a7agguCB7onz977R5Ctch37R1/ADsWTLgiBZW9QxLQ8h68Nfw+dmMc/IdOLwt7H6HCOYgkVNNVEm48Lchu/Y75q14IPzGN2MpVXXLJrTWFe8MA5zh9+622LO6gsq8+fnlVx60N0oSqyTPv0WF3vMAc4YYPkrGTpbyR219hD1MQ1zT2Be1JRG1Tflfqk0A5sDi98co8xPZ8MzSROOg0TGfMUEUC3Cxox5vsPsoA8vHwKro3cIzN2JAhsWOsNLWp5553GWIwbj+Ujxo4Cx01of9pcRvRsiYjobBMiAoePfsprQ/FxNx/ixpfQNlXJakPoivw6vpVeheVq3mu21HkQ9IWnJ6uRtIqz2MDst2FzyK1iAUL0A57HQ75Adu6Rvr9AzYWblJ4bGoq/WuapyoojtYvdn1vQT9sZsH6AKfHWMZF/+1SjtQlULn/RvAamdK6RM9ZFXOs6ktSEKP7s+83ZbMXlEcd83XRqunCx3RSVgmFZpJAwDue6MfRdKbb1QVry9Xyv6kZEWYadi6JoDaM5SdX6vAz/C3gCjIvWxQXTXV3BhWZeRZTmulfmgqI/GGkATiCrsd9cxG+m9mbXnOaDn84nvkHXjFeCHhqtjQHJulHsTXq/p2/1Lxg/SYbEX9i67JgHo0sE7zwQn6fPbU0eAb0qPhk13ea0JnPLEDWO+0PV0suQI71D8zqzIAyqo4b3fqZ5S5gw==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_修改用户信息.rd b/Pages/内建页面/FGC_修改用户信息.rd index e80e7736..e4e77694 100644 --- a/Pages/内建页面/FGC_修改用户信息.rd +++ b/Pages/内建页面/FGC_修改用户信息.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 55, - "RowCount": 30 + "ColumnCount": 41, + "RowCount": 23 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.json b/Pages/流程页面文件夹/FGC_我的待办.json index f0c5a3bc..55c8d457 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.json +++ b/Pages/流程页面文件夹/FGC_我的待办.json @@ -1563,7 +1563,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_母版页", + "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的待办_手机版", "Title": "我的待办", "AuthorizeInfo": { @@ -1577,4 +1577,4 @@ "PaperSize": {}, "Margin": {} } -}//5/8vJg30KQGDgggwLrNLPuNVHw8L8Xy3m8VDtz4mtKBaJDtDTeKCv5rT14tYJXWHH7fVZEJTj1HT6+vKTZZGuslWU70lwl6YfIsi8bmDIfA8HZo6qju/kczqD2rNaQDUgodkGc4BeZiY9D0axsdjhn/QFn2/eAMy07X9ObmClV5K5kxGlh8TIfDPFHJVB+N9DtLrD7HR1+9tXl7ElsYXAdUQtf4wtPYdtZOupBF9ln3yncL4GG5Hpiaoi59y0HkH6dFFXAxzk4qxbXtyRgsedZ0QamqUdU1cNcB/I1scWduUAqfeVDGoKpLBIt1drAc8Wtr9Xd5Pz3EMrzWVPLlgFjcblSN1hIX+F2jAkDk9JzDO01fzzFw/RwEpTNOCfUwhOOyjGKHfjmOKflkPsxkexE4WsCVbCcLa8sshNYQFI2fzMVsjocMiMYj2xlK3WI8SiOnDqN2SUOaHYk17rOZFupvs9NwVoy1LzQgfHcTXGRh2vJcS6uauMbZjpvolDPiHKMVDddFjumPldb40KXf/tgJ8Rn9tsd91CNnpubAu/bHzeqlJjaSdVGZ5p+kifMJ/ZxyBV9nqCKMn7s5gp0r+Wk8mrKubipzmEI+Cho4X1TMN87p4J5hIz39W+VeiABFBpquwMFg02JUIOOIduQbC3VEY/hXN4XOfaLfyqS9pGhFrSg7KCY0x5upFqvb+WP7xUiq4kytoB4NZTNQ7Zr5Ixhszmfg8o1jGvT7aw5A2wrEPHvPOplqo6oGIP7ZqrdATznLPFyM6r6wFL7a9bRQy8OHG/EdKFNgnjmjYmX7SK3D3f+lKKJSTygy43kU3jrEBFF0hQ3eR8M/I5p8Xtm+pqDwmHWfPBdl50EwSTOXMxDiQZOuO7YI9nU99M9EhP4/a3dA5IkKqf4Aw+6AcjxAESA==|920 \ No newline at end of file +}//abg//+0fRO6QR5s0x48uaynV6L7+hzYY26Fk3VhIHvRH5Z+SfFOOMt4gU7mDzGuNG5TAWEGSswIqmJ9gjLfQoju7UzdTJlRl/T7m3SSVgqb0+HcZFcQSlwxn3/vtpUIIgwKqLEW/+xMZeFGghfskKYcEh1gYsjFkxcj7AESx0ztct3z3j98j9q5WbzUnP3yRd4El4xnrEEttT3FORa3fK+jLpficu3qeu6zmKgRzqcQx9hn7bL6GdT355+e1tgxCKKEmy36ggHEtTltG7sBtxJmzRu6HCayi2ASsE3MB4qh5U1GU6bmXtL8E/OVT35bjb+MhVvqIKvZICDZbpEI4O7q6WVY0/aFHpl4RIAbc51df1Re7okGjvqkk0oesVB+xUGq9GczyXQGOYEp68JkZ698anemGRPYURPgHiN/OqOo4CcWPFZPSpSAMS3fE6Vpz6YdufFZj+W/TOehRb2JHOpmou8GsBy5LbSjaBYJjNI+s7uX6+UFucR1BgLdZpRO8LDoGOjSDcKOYnqdNG7h9h9kcnuaTr5hv/KNLHwf9gA0X1ig1fFtm3b/8xzUwxKpWltXjWS/T+S7XOPsa5H7u+qr+mRAcjGlAqam10ZTOI0ULqXFZcc8Kb1m11TxgCk6VPjIL+xIDtRoPVWxDWj9EoakLRiSg0yJ6gRokIucbZu72BkDU12hzWWqgSB//BJ86Cp8rfEDKzp19DvfTU/FkWlO+O3K8B6OmxkZnVTcU1LaIYR3zqXiXvSA1aDGzsqrpLs+UJg5TKzcqlOpTWwdJpFDSdEHFnXWMH5pISuBo63i5I79ZFn0G8eijlUrJwD+LDVO6RYnINrRDr3vZ/iwjzCUkezG+XXxmfqZ3yJn6DfCRQmyY2ZyzhYHgn5ADaYQRmNZmOP2lJ3NaslDaw0JQag==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.json b/Pages/项目/项目列表.json similarity index 95% rename from Pages/项目首页/项目列表.json rename to Pages/项目/项目列表.json index 92cf3474..29432472 100644 --- a/Pages/项目首页/项目列表.json +++ b/Pages/项目/项目列表.json @@ -524,7 +524,7 @@ } } ], - "ID": "8ca03558-2ba6-47e9-9770-db290212db59" + "ID": "ab18cb7c-632c-47c6-bc4c-d601191ef539" }, { "CommandList": [ @@ -537,7 +537,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "54414511-ed05-493e-bbd1-d55f8a97ba5d" + "ID": "0c5fb35c-a982-4847-90c3-0149720ddcb2" } ] } @@ -880,4 +880,4 @@ "PaperSize": {}, "Margin": {} } -}//Juprtj1QbYLFtPo+vVB6pBQfauZhKYhD9N1CnCe2ov29QObdrpbB83xj0ewX9JSarwIH8LaC1VhgfctHud7sCO3qBzy+K8djjk9nyhmNfWiU+2HeG22dfLbf00tEZHymYAwWAIK5N2PH8iFIbqlO0sOLsv5XxqmKtK/sX4Xt1z4Yeq8Yfy2ZbuJRc659fxWMNH2+qJu+MneAymXRjbs21sIVQKTVEJx2FE5CslC4Uer6CDahe8J7XsDCR5iUHwnDmpw05y2Ywhw8kIS8uZGVL6a1ZXr9ThAElr1pqUnYBP6iKArVNF1jX1yZtsQjix+FjbtwtPXY6zpBI9YLksEkRHsPXtw+odcb4WvpbBFFrHZnig+fLQQfSyRxejG76jtGyCl8ljNxb27DJx1+x4MqbU9vnUfOa9wwkqkNpyvLrI7DGMlQujKraILXjwnR2cwW3U5guwGTofKAG6euS3qT+Qfm9vaISv0Qlb6pRqEZ6yxNasRf5fEHx4J5QxXyQn9dZZRu1yU53/j2Zn4XEGgoKw5zKWgpfqAcM6EY6/HuNMf2he4agQAXPTQGVt+NVumOui/IuSdewROmm1E2pg1uRIQv23j4DGLZF/O7BGhEJSuZ2PZDH71bBTF36HTjfrlXi0N9oXZxb2iXv4iOPfgHV94FZN8T7hAALk7leb3nhjIUo1f8DUz85pLQ+wX0o9tQABmNQW2ohMbXxFDeeAMSGqlJ2OZZmwBIBiQgxWcdseShB50/Y/dBykxDcKsvJBztWp83bKFFjzzBgO3w+8lxjiyZ+RI7mjMbNpVUSR3fWSgZ8zTvJRrZxImUcdHBuzFMfo1LdEkyLXLP3GkqG3D1PIjg7YrgSB/g3Po2hFYJznuRenxQfY1OOZcl11IRq/1SiWkMM9VsAu6CLtQCV/hcVg==|920 \ No newline at end of file +}//eqWEvCm3TAnJwn4BpPAjgQQFZFejUIA/FjbrIkUsgypBoDVnUOSW0e/W9lqPreuXkoJl6Ctg1C1Q81R9RIGVUat2Wtwn+6L66dk52GGJHzd4eyy+zSVtpe6ZpLXMsvImwQQYnZfWiAHBXD2/nUAvwcB7HTQgoH98c3mbE0KzKcpZ96ZWeTLNf3F4y6QPylW1keQh8pwd7nSL53kb7fITgtv0Fgrkibftcg4vt1MR8DQHhIJfga62JZtA8mdcsgp46ld8NLpgiIeoOz9QnEoJS+fGmt392P2s7m6DXyggtoPt36a1wzjsmpTkhviKyHGzPxEceyvYvbkxgW8NlgzdrTpJgsQaH4LO+AMCy4RaFEqVF7mqhdJgAxFngkjxUzIFp9Gdv7NZasSNiYkigJB+O9XAElZW5paf2C1NMpqVffOMoEX1Ad8TiabN030DTo8nk+2ojWALOdidudnrw4M6j3dIFOQFvgQK1x/TAgF7E1SJASciJ4QLkc51ZwkrNP7P/jBrJK+euz3R3mLV4jKi0gETkN2LUXgIpZmhplS5XK0xhhbyG+1M3QX6eNYL6t2LC9eLB4dHRxw5QS+hYIkxGTootlryyIpx8oEnaY8yXo/MqyeFwhKdtNSzsEPp5ITuaLrrQDm1bysA3s+SQHsVR668T6DD8YxaHnPiKT62QasBGEc5SEKCG+is4bX1X5Q1pgXlEG/+LZo10I+VBY0nQSlpPY5tShgW6NsDMXAPwY2lICAd+OyjdCbtxYDcEF/ezzbJc/FnaOA99jR1YzpHDvlcdPMxYTXWThe5YreJToVKlaFR0/mjQYf9P017/cnj8pmkXgcz60J9Nmzq91sVi4N3URld0JJEgZCL3TW1Upe1jHv98E63aBUNEl1pFfEQXu7OZ5ckjdjAooPzA2oZyw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.rd b/Pages/项目/项目列表.rd similarity index 100% rename from Pages/项目首页/项目列表.rd rename to Pages/项目/项目列表.rd diff --git a/Pages/项目/项目岗位详情.json b/Pages/项目/项目岗位详情.json new file mode 100644 index 00000000..4a118bb7 --- /dev/null +++ b/Pages/项目/项目岗位详情.json @@ -0,0 +1,510 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 10 + ], + "Count": 11, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "岗位名称", + "4,1": "默认时薪", + "8,1": "取消", + "8,12": "保存" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "7a9344cd-068f-4423-8cf9-2c40559deff8" + }, + "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" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "2155b146-3113-44fc-9ba9-225f4772e1e7" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false, + "InputMessageTitle": "提示", + "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" + } + }, + "8,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "8,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目岗位详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "9da4aad2-d4b3-4c96-9760-8996730192af" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "4ec11fb7-4daf-4976-a395-8d6874a9e61d" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "ShowConfirm": false + } + ], + "ID": "a9885ba9-5f2c-41fb-9dc5-0f10a7bd4c4e" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位详情!ID" + } + } + ] + } + ], + "ID": "c7620d24-df20-458d-9cfb-e0b3495dce61" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目" + } + ], + "ID": "d28051e7-5e3f-4652-8438-39052cb27b57" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "10,0": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "42aceeff-c7e5-4c36-b5a7-7d9fb1564bfb" + } + }, + "10,4": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "75c28a60-1b04-4f94-8ae0-02966a2f6013" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "BorderBottom": 0 + }, + { + "Background": 4, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "¥#,##0_);[Red](¥#,##0)", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 3 + }, + { + "Color": 5 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "4,0": 1, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, + "4,15": 1, + "5,0": 1, + "5,1": 1, + "5,15": 1, + "6,1": 3, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "8,1": 0, + "8,2": 1, + "8,3": 1, + "8,12": 0, + "8,13": 1, + "8,14": 1, + "10,0": 4, + "10,1": 5, + "10,2": 5, + "10,3": 6, + "10,4": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "8,1,1,3", + "8,12,1,3", + "10,4,1,3", + "10,0,1,4", + "2,1,1,14", + "5,1,1,14" + ], + "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": [], + "RelatedDataTableName": "项目成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位详情!$A$11" + }, + { + "Name": "ID", + "Formula": "项目岗位详情!$E$11" + } + ] +}//MAo6PZjcGUVkgb1scBw6yl8lEcJ5dz1VuMKNVrDvHuAV/bsmsB2hrJcXXCq+vv8k0y/gQaXpYu5d/z2gY6Kfksuyz4bKxgKrPOvUAsyZEAlV9oERNaD0NDfDaOIDdv3KtRk5jxrn4oWiGnUXvReEvrMXYZTSctUbiVbJu0sy2rcDp/meYTNTU4gIiQSyDpicSK6rH+TAXgsXN8iEB3P2apc1UsLKCkqkLcSx5YHtcr0k6y6RqvLZZ1j0EpvgefzUi5c0uwu7v1LBEdd8QZj8uRgA5zKR1lKgQHtiIDzfEExkkbxp1XeEspHKPZN9NsaRTIambTN4V512Ezqa/MwOj7kdzTZeyld0seS7mg+MHDCdY6pyNTTEKxi4Jq21IEv3ZtrdifNANUu9loWotv/5WwsSFrU8rNFYgi4DKwZUPwuBzlYKZ6MboBxarajUXln76kOAaB7cofdnxwkAz1WKajD3wQ3g9p1MJ+vQLRxhZ5jYki+ZmpluA7vNCzdQaQzfb2IP0mvHdI0JcEIQmwOt5dmolSDzZXxySVQ+hZNPufaFC9Osm+gkl3+ain7bCvWdCyWj8/J+HuxwM7JnWn8mFJdIu6SkvR4IhPL2Keq2ckT8ixBBBgP3MLv4Lsri8Xoxz/7E/S6d6qo2m9I943Gc7p+5dIC8aYOMXFXWk5IDFEpoIbHTuDWlVJkC4V3ING6Rzx2TLEX7BMyz56SQtiUmSTyLJqfwP+X7GsUAyOuAmi5CaqcmrUE5gW2Yb5GpRgLbtqpDPLXtOPLOIwZCt8dTDEIzXqDt6x9mJo5ze7vLEdF6ewuEeNybFCXXH9PDlI9fHEgdexVLq0TrrTOtmc9zVEdfmTavyrrE/P/DQWkqci5GPtdWdg0JkEHuOrMy0DfeiSmOCd1QoLm4LyG/KVeHxA==|920 \ No newline at end of file diff --git a/Pages/项目/项目岗位详情.rd b/Pages/项目/项目岗位详情.rd new file mode 100644 index 00000000..069c4384 --- /dev/null +++ b/Pages/项目/项目岗位详情.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 11, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位详情!$A$11" + }, + { + "Name": "ID", + "Formula": "项目岗位详情!$E$11" + } + ] +} \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json new file mode 100644 index 00000000..e85e8984 --- /dev/null +++ b/Pages/项目/项目成员详情.json @@ -0,0 +1,879 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 16 + ], + "Count": 17, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "成员", + "4,1": "成员默认时薪", + "7,1": "岗位", + "10,1": "默认时薪", + "14,1": "取消", + "14,12": "保存" + }, + "Formulas": { + "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "1af53027-9f17-4545-99e5-2dd7e8cdd752" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "90e7d711-9325-4beb-99f0-f4a1e76f26cd" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "439dadad-a41a-460f-ac7d-2767040df148" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "f71da0ef-5394-41a0-b91d-a27c8397362c", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "默认时薪" + } + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controls": false, + "controlsPosition": true, + "IsDisabled": true + } + }, + "8,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "fdbf4197-fa81-407e-8471-5bb15a95a4c8" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "岗位", + "TableValue": { + "TableName": "项目岗位", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "fc96af9b-45a5-4390-a5e6-d6457ff37273" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "de9d950e-3a64-451e-91ae-f82c4a256835" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "f1e8788e6b7f43ada37ce5974657e4b9" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=岗位" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "ConfirmDialogSettings": { + "Title": "确认", + "FormulaText": "当前岗位时薪于设置不一致，是否为你更新？", + "YesButtonText": "是", + "NoButtonText": "否", + "ConfirmIcon": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + } + ] + } + ], + "ID": "d24a2f7b-c625-461a-a07a-857f2bcdb804" + } + ] + } + ], + "ID": "3b9893e2-a358-429a-99d0-049ce1b9c524" + } + ] + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "ac894880-71bc-4521-87e0-944192ddb93f" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "96f973ab-a19c-4f6a-b03a-c279f0ebf7d8" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "69a15af3-6c19-479c-86fb-65e3ac40a238" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "11,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "5ec66ac2-1b7c-4a99-b6eb-6b227e6435c6" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false, + "InputMessageTitle": "提示", + "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" + } + }, + "14,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "14,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "6ee34442-9d7c-49fb-bc92-17f7d0c3e78b" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "3ef5972e-4224-4329-83e7-89a8db26b303" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "ShowConfirm": false + } + ], + "ID": "92afc930-79bb-47ae-b6aa-e8cde6732512" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!ID" + } + } + ] + } + ], + "ID": "333bec23-450e-4a17-b4f0-e03c73a2cda6" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目" + } + ], + "ID": "ba01a341-f200-48b9-87b6-76cf22478b0d" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "16,0": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "cc5c0ec5-c025-4baa-9241-87b443d7c451" + } + }, + "16,4": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "314562f3-292a-48d6-ae9b-f410d11976b3" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "BorderBottom": 0 + }, + { + "Background": 4, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "¥#,##0_);[Red](¥#,##0)", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 3 + }, + { + "Color": 5 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "5,1": 2, + "7,0": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,15": 1, + "8,0": 1, + "8,1": 1, + "8,15": 1, + "9,0": 1, + "9,1": 1, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,8": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "10,0": 1, + "10,1": 0, + "10,2": 1, + "10,3": 1, + "10,4": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,8": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "11,0": 1, + "11,1": 1, + "11,15": 1, + "12,1": 3, + "12,2": 3, + "12,3": 3, + "12,4": 3, + "12,5": 3, + "12,6": 3, + "12,7": 3, + "12,8": 3, + "12,9": 3, + "12,10": 3, + "12,11": 3, + "12,12": 3, + "12,13": 3, + "12,14": 3, + "14,1": 0, + "14,2": 1, + "14,3": 1, + "14,12": 0, + "14,13": 1, + "14,14": 1, + "16,0": 4, + "16,1": 5, + "16,2": 5, + "16,3": 6, + "16,4": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "14,1,1,3", + "14,12,1,3", + "2,1,1,14", + "8,1,1,14", + "11,1,1,14", + "16,0,1,4", + "16,4,1,3", + "5,1,1,14" + ], + "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": [], + "RelatedDataTableName": "项目成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目成员详情!$A$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" + } + ] +}//zjp1dKiZsTgWzcBy7k57awgY+9kFNxH9u+IgQidUdzMYfTtdqrHWCV3f0iSJOkVgBwYz0zLlbtIaooMIjwxuTfWlKcGhZctUW52+f/7tf1YOSkwfE96Isr6kstFx4OxZjUhhtyjtQivhbqYNgRZQWe47QlKB0iZi//0zuYcP5qi80wKR53H1Hcx0yO971Tte07/bh8CptxgH4/tAZM1wZiWXkF5Guktcyh8n41vwsTrgwcd+gzp10sWl1xMHDQkVwMLBe4gRMXEWG9IUUeCOSIaMnX4KyVP+AjbXysX11b7W7sHPMnnjxgKAbI2NNTEfDnLZ/sKqvsPpJJyWBh1Kygjy+xfPpbKlPUhHalJvLBIEopuTSoDlRr8dJA4V5N8gYXLzqGDzqS5a77GdFl/aiOF7IAeTB/H+tO3sG9udfA00zpPuF07ZcP6zN3XFfvkkJt1RcVwwbBgdI185G/3hEgy6+ekitCVDnFepnnEEJ0YeyDnAs/3/kT2j0xKwo+93PaE2vlgrf4KvgxBm4M/FFbhXjrgJf+dvc/WvLxJGTtdJKJUIe0rB+hXqVgzSErLINSruSDxRLFrMNZLMAHan6ZZl71Xd22VAuqqWGLqVXC9IgyxL9ZMHRnCvKBDl+lerFIqC0hsYxnwfR+MyN8ZBM75CO9qHKo2XaYdMXvEPZxCecZFqTGW6nawfvXgn0EVUIl1Y+saAgmqtajiYnSSF9iuwP3cfzjEpBaKGdyoZkIl0czH2vu4hSZcfKuOy3JOSpgbmD1JOFScgh7cV+Z5dFcmss6dUzCVYTowdSeIf7HBDa5zUy2ZdHly7hmcGrVDq6FNuqTUsH03pYAJEU+sQ6vhhdCZzYoMO2zW5N7S5WKJo75LW0/NXXJoPbOGLa2ecYMxSYsLaS2qImwcoRTNY5w==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.rd b/Pages/项目/项目成员详情.rd new file mode 100644 index 00000000..9dd7a824 --- /dev/null +++ b/Pages/项目/项目成员详情.rd @@ -0,0 +1,18 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 17, + "Formulas": { + "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目成员详情!$A$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" + } + ] +} \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json similarity index 93% rename from Pages/项目首页/项目标题.json rename to Pages/项目/项目首页/项目标题.json index e89325fa..278bebe2 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "e41ad2e9-e738-44ae-9d9c-c879262f7346" + "ID": "2da05b25-ac8b-4a2f-952f-a512bb15a679" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "bf09c564-9887-49a5-ba0c-7ed60259cd71" + "ID": "fbdf945f-8a62-482f-9ec0-8a7b7a85e890" }, { "Condition": { @@ -391,7 +391,7 @@ "PageName": "项目配置首页" } ], - "ID": "d315568a-84c1-474b-b36d-0902ce41841f" + "ID": "6406a4c8-a0a3-44d1-9f20-f56b08ee2e6a" }, { "Condition": { @@ -434,7 +434,7 @@ } } ], - "ID": "aa5575cc-9221-4088-8d57-21b70838acdc" + "ID": "bf74c72c-90d6-4115-9d7d-c3334a062239" }, { "Condition": { @@ -470,12 +470,12 @@ "Message": "操作完成" } ], - "ID": "d4fd1c0a-43f0-4f6b-b753-a66d2a2d2b8e" + "ID": "74c532af-70e6-440d-b1e2-f79b68857a05" } ] } ], - "ID": "73c7ce0a-6c29-4a9c-8bc4-f34f2602c10d" + "ID": "e06991e6-a2f6-40a6-8204-e150bc069c50" } ] } @@ -548,7 +548,7 @@ ] } ], - "ID": "e72e5d6b-ef17-437e-bf77-3f73b5123686" + "ID": "b1c94289-5eef-4f80-9501-4214b39cbeaf" } ] } @@ -573,28 +573,28 @@ "Value": "项目工时", "Name": "工时" }, - { - "Value": "文档", - "Name": "文档" - }, { "Value": "项目成员", "Name": "人员" }, { - "Value": "负荷", + "Value": "项目负荷", "Name": "负荷" }, { - "Value": "钉钉群", + "Value": "项目群", "Name": "沟通" }, { - "Value": "代码", + "Value": "项目文档", + "Name": "文档" + }, + { + "Value": "项目代码", "Name": "代码" }, { - "Value": "统计", + "Value": "项目统计", "Name": "统计" } ], @@ -775,4 +775,4 @@ "Formula": "项目标题!$O$6" } ] -}//IdTEDTFa8yUELguX+Y3GEgl602drJwF6gymv1sE3ZmDhxZiDpjuuxnQV42YqdeW9zBZ/JG/jxK3hE/6uZ0V1i6TPiPshtUJvJArkScgjlsfZPn4Isao63MFwzsUXywYxDMLIi3oPfz4lNht2TGqlM8s4U/TSFW+FtEWshCncjAYjzPi3Y8icF3O838VvXXGx6awu3kbwShlvybfmcuOSy27yV69O/9biTjaz4HkBMafD5TmZ7wrl0BoEaz/rb6pxUcspCiFn+vLSH5T6gp0eJ8et0xUVXLvIpasHiL5Rup1nJ8xdfFySYbglilAtGU/5J7hdIwOzcn2U5gY5qNLJUR1z7Tt2pT065f9+PRzymHT0FiicbSKtz4I1t/Ny15A8jmql0q2A2P3WNeiox/jdA4cWXK0qeYJ///0buvOPW5s0eUXTyMD1Y0Gt9H2H0A3NXyV024Mp/KgI7vHhCb0drV2WarEb/Lq8x9xgntClgzWclg+BMd3ICK5Iy5Mv53bOS0e0Kw6VkpBY+U+XEqczHqjLyIJWrCZFnR3EbsUa6DEQGikUib4dKXWZ8rZOmoWzARl+MmxxVo64n+gDLrCt3T0epjVE36oGQgjxP7uDkb3qT9v6FrAUzio7p/3cErUvV7Rx5F02tIlZoVtp4oYEqTiRMEzKo9Q//j+sx8aCPoiLa1q103P/b5RODEfk1KwynH2C1UOCWiXkc6Iiuk0e6watf/ULJ76ZIHSvGZmqifAAMRO4LLX0Nri6EuP2c+gOy+DxBAHqcmKgsE/53tcrzHrUhHOk3SW/f0cJ/WtHDNr7DeWdNvzYAyXOEUccQvYib47YHJL7OsWCU8R7SOWv+vGNY5T5PkPsx8/a3ZrsmEKiJiauquN441F2LXulHqgXiaY4MngiOB54LhUlCS5TFQ==|920 \ No newline at end of file +}//J7Ajnq25wPyn0K40+h1acYmX0m85HEVtGHgGOXJwqJb64bwUCYmp9t4OSeh58a//cYPw0UHKrU0IwK+dcfucaH51cHp0oJfnzDMdDAdF374DaDYm1zvuCVMBFwGykNN0JD+94D7U4TEoQLBRFc+Y0+Fg78Tr2LYRWR0FZgbHyFPuzlqVrRBrtUEdA/eSftNThyCNUuKs1SAu+qToNpkG2VwT4CxOv8chVO7iBKlGyl3JzcObialzg5jJQFo2ayD7PGmpNUCVfjgcxOJ4yjZQjD6VYbYMD+RB/T+MWXK4z+d02uxEnNCOyj59KU29bVKuUE74T1A25fTnBpFzEIA9gJrrv9FkXWZmFZUBgiCvbsAroWwhIBNkQDQxmfV37x0P0MxppChpfsDQIH2mMjolv0SXGOfA3OulPEbqupd/JaqLHAvYAZe5qp1NKV212IJR0uhKdTXerLfNczYXPUkGHDw22q7hBS7UrT5S1JkpxVEO6nFFs7aVwmXUiMp9hH1OlbaXI1LyECbqnhxlgg7Th40ouBLrh3hj9+MaSF58S4UBJACSfjw/qTon53LmRfzvb4W9hvc3W0NgpnUJxjYTFshCparej6dZ9gkNfzyBJ7S5mAxm4HD16+wulTcSVIB2sdxVqPseYYoCgjfGUroUAksTJe6Vz2UKZ2YL41MZOqYn79E7TRGOgObGAN4SMLZCTB1HaSn6g0v1ndAkvCbNg1j8lhxk9jtcYhntxRzZJtQWXeeYrgXZoWVzkhxkyFrjvnXRpIFWdjNy1rbzDb/PudBMsmygViIez8/jNIweoU5VZ7VjgRyxdvYl7XkSbRSgb5zqmvpQ3/vs7Cg30mycwx302rwzANNET4d5or5IiF4ZJXgyCpi6XrAieGwm4aL0L7NqbRv9tbIphjan90yzNA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd similarity index 100% rename from Pages/项目首页/项目标题.rd rename to Pages/项目/项目首页/项目标题.rd diff --git a/Pages/项目首页/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json similarity index 97% rename from Pages/项目首页/项目信息.json rename to Pages/项目/项目首页/项目配置/项目信息.json index b543854e..11c57671 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -898,7 +898,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "f5ed9807-e089-4980-93da-4300af09393f" + "ID": "350f0ab4-392c-4404-94b5-2866e5e2a3eb" } ] } @@ -952,7 +952,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "6edbff22-cab7-4a57-adc1-bb0bde9962c7" + "ID": "29369a71-9ba3-404f-a296-6fb9e785ba97" } ] } @@ -1384,7 +1384,7 @@ "ReloadData": true } ], - "ID": "67d1f856-a969-49d2-aa85-29d3deed7e3f" + "ID": "a7af1694-6f0c-4d59-8435-2836d7463638" }, { "CommandList": [ @@ -1399,12 +1399,12 @@ "BtnText": "知道了" } ], - "ID": "917f1617-c025-4a83-b595-6a150d176efe" + "ID": "597f9e25-fb50-4dd3-9019-74db6a8fd632" } ] } ], - "ID": "bc2c28f9-05fd-4bec-bb93-83bf74506def" + "ID": "5b915fd3-1dbc-479f-a336-3f31368e8c43" }, { "CommandList": [ @@ -1422,7 +1422,7 @@ "ReloadData": true } ], - "ID": "ed40dad9-627a-42a9-a0df-9aa05188a39d" + "ID": "c3b76761-dc4b-4427-bc09-0baa4b33dfac" } ] } @@ -2032,4 +2032,4 @@ "Formula": "项目信息!$B$36" } ] -}//UoQlvJtY7eZcdRBW2Qyt4b991A1ztyTeq9QgypVs5d65Qm8MxSTyvzHcfYEC0LlW1MN7MeAxBhhqd8R2uyXlHfeSb5FQkSgvkwLM8Mi1k6XVQWpwRtPKnLdo3Amx+kX+7SZWK+7SfDPdJKsE2QWOysM+wKtbRlNL/9RLUAOXBu3moKlHl8MsABmqPva4/EwK+D1y/6MqnOtkVSDG9Y1Jj5GP1fQmP4O4zvOXLqZvT9y29S51TYv9VTStgmKIIXLbGDZr/FL9VzPGb3KkksG/nrHUAAlYSV9pAOH04YlMj3vvM7v0/7Dj9zbRm+7mkTiReVkkjpJkeD3y1BXL1aYG3yLfbdKw8TvUmJcQBnSkOnr3L7l/sGCmCcdkwM1low+K0DRJQuNzZw+uvSZoeAVo8sycESQeT1zc4Vx/ett1aPjX6qCOtger3BWM8O1m1W57RRtUbo4/uxDmY3jhFqPwVZ9Nb/XvcZfgW4Ovw3VOcCXNdmFX+j7ebZuSvQXVqA32pJdNP+Xp2kMc4ktZdVkS/Le5sf+uAS2A6CmgwlFK62Xz5Fa47kvFxNQ+WNFfrGgCTlQD/gCVcmedEUIogn8lsVfLDVU/UkePDWOHkTwV2x4sDg4Wix6hwOxoOp/YK7Zz8m0CmsWe5jGSzTyoz9Fc5VwU0FiorrYKr1jmgny8YqDvaLm/ek4CB88ZW+wUMBGW16spniDgwlEraY+DiDNytHpPkY6mSFjYgoZsnu4AXUdtcqQqpVwgiHuHHuRdb72w8m8Dw4qL7rPcJfy2mMQhiPFETOvmcppQNH/JHaPKh0JnMc2rDx9MGmPjoBozHC8WAeYkFLYZqVcs/4g2pNKJAZWrX9m6kXkFYpO4XZw9EYNirhyK/fxuZkggFWZqQbC1NtJBc2Nz1eY0nOwbBbRg/g==|920 \ No newline at end of file +}//LiNbT/tW1cFv+8CPlW5vz3LfdwC0LE8GDQ54/tlsVMrF8vKrxBZbXs/LajJENaAL+9w4YqKzp4Qer+ieXtx2kRXejiMgoF3AsXzqUABONGbE8aIueTBzlkdjTBBqZ5YHyl3UkNX58Gob4L6JOGnvyxOF6I0rOFJSxOejtpQLiI+dQwNuyBUEYUVBGxQGAbmxg/3DMrxVF6NNVwIOxlpnuT16hn1mu1RlnjdCGary2yNm+KPpzAzY6YXt6nlMIwA5CSy99Z9NdpgppuKOiz5In7oHFNByQ5kcoVSi64F6Vft7/67opBNVhAxcVi+oVr/Z3ZWxOv9hGws9oM+KjUZ0LrfLVyyH0LPWW91IbiHzNz9jVbCPh2cRRmK5PyJ3dA1sz9qsNm74JGn58bdlxlkLJQRpYJVZtrmTFkQa1wwsBaR2F0/Q9xDsfhK1scaOwtpgFU+WClfpjim/zm/tav1gUpA4hSZ5OKMuNFecleSSSZB5pyrkSQQK82FAWzhJlZHaQCfCwSu0SuTUyjqrr5HzRtWakGaGxx3YboYC7ud61lkXft6n5L7o2FmJyEPyA4DgbsN2nbosq6+GxH1U6CZxSR3B7KJ0KnjMi7x7urOLuOiOyhsQCo4u7jxwK6vJKBtzrsgNQJOJRb2hSaNZRq5c+JvFim23bYLt5tMYSfQsdGyivtORGLnL61EXpGI2Ap6DPmp4c2EnmKgNDwsYdrN5ycR2jH8B3MbDRw+OCo07aPXanwcXb5Zv46UKHwx8xCbGkpxecgjFR5dcyc5DBIYsveti3555QqHLvpPUit5jwshRqkjaq+KY9Z6TF5EEy/aDtn7V+Z9ZDL2kvjdbZTx0uHoXstE7caVxMsf6DIfLAJGq3jT90CFoVKCgHUQN5IZe01FxBGxiVE+VIFQaSGQYLA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.rd b/Pages/项目/项目首页/项目配置/项目信息.rd similarity index 100% rename from Pages/项目首页/项目信息.rd rename to Pages/项目/项目首页/项目配置/项目信息.rd diff --git a/Pages/项目首页/项目审批.json b/Pages/项目/项目首页/项目配置/项目审批.json similarity index 100% rename from Pages/项目首页/项目审批.json rename to Pages/项目/项目首页/项目配置/项目审批.json diff --git a/Pages/项目首页/项目审批.rd b/Pages/项目/项目首页/项目配置/项目审批.rd similarity index 100% rename from Pages/项目首页/项目审批.rd rename to Pages/项目/项目首页/项目配置/项目审批.rd diff --git a/Pages/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json similarity index 100% rename from Pages/项目首页/项目配置/项目岗位配置.json rename to Pages/项目/项目首页/项目配置/项目岗位配置.json diff --git a/Pages/项目首页/项目配置/项目岗位配置.rd b/Pages/项目/项目首页/项目配置/项目岗位配置.rd similarity index 100% rename from Pages/项目首页/项目配置/项目岗位配置.rd rename to Pages/项目/项目首页/项目配置/项目岗位配置.rd diff --git a/Pages/项目首页/项目配置/项目配置首页.json b/Pages/项目/项目首页/项目配置/项目配置首页.json similarity index 100% rename from Pages/项目首页/项目配置/项目配置首页.json rename to Pages/项目/项目首页/项目配置/项目配置首页.json diff --git a/Pages/项目首页/项目配置/项目配置首页.rd b/Pages/项目/项目首页/项目配置/项目配置首页.rd similarity index 100% rename from Pages/项目首页/项目配置/项目配置首页.rd rename to Pages/项目/项目首页/项目配置/项目配置首页.rd diff --git a/Pages/项目首页/项目首页子页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json similarity index 100% rename from Pages/项目首页/项目首页子页面/任务列表.json rename to Pages/项目/项目首页/项目首页-容器页面/任务列表.json diff --git a/Pages/项目首页/项目首页子页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/任务列表.rd rename to Pages/项目/项目首页/项目首页-容器页面/任务列表.rd diff --git a/Pages/项目首页/项目首页子页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json similarity index 60% rename from Pages/项目首页/项目首页子页面/项目工时.json rename to Pages/项目/项目首页/项目首页-容器页面/项目工时.json index d8abbd5e..6e81e6ae 100644 --- a/Pages/项目首页/项目首页子页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -254,10 +254,6 @@ "Count": 40, "DefaultSize": 32.0 }, - "Values": { - "1,26": "任务详细视图", - "1,35": "查询" - }, "AttachInfos": { "1,1": { "CellType": { @@ -342,47 +338,25 @@ "Style": 3, "Items": [ { - "Value": "", - "DisplayValue": "所有" + "Value": "项目视图", + "DisplayValue": "项目视图" }, { - "Value": "计划", - "DisplayValue": "计划工时" + "Value": "任务视图", + "DisplayValue": "任务视图" }, { - "Value": "实际", - "DisplayValue": "实际工时" + "Value": "人员视图", + "DisplayValue": "人员视图" } - ] - }, - "RulesGuidList": [ - "b6b4b68b-08cc-42ce-a005-d99ef29be911" - ] - }, - "1,26": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "CellDefaultValue": "任务详细视图", - "Items": [ - { - "Value": "任务详细视图", - "DisplayValue": "任务详细视图" - }, - { - "Value": "人员统计视图", - "DisplayValue": "人员统计视图" - } - ] - } - }, - "1,35": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + ], "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, "Title": "加载中" }, { @@ -395,24 +369,96 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目工时!AA2" + "SerializeProperty": "=项目工时!L2" } ] }, - "value": "任务详细视图" + "value": "项目视图" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "数据列表", "TableValue": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "1eabda85-4590-4a80-97d5-4832f56c1b32" + }, + "ColumnName": "日期" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "1dba925a-ee48-483a-839c-829d96f135fb" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1" + }, + "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "a53312c8-5aa0-4cb1-bcf2-0ff52e4414a0" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "3c681ee0-e2ea-4ac6-8d72-89d3e9363d7a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "f9fb593fe9db492e8f528f7016e24b57" + } + ], + "ID": "9c7d6b0d-6129-49d6-987e-b4ac92917421" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目工时!L2" + } + ] + }, + "value": "任务视图" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "数据列表", + "TableValue": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "007db99a-0c20-441c-ae48-e2dd7c22e784", + "GUID": "fbc81aaa-b6ce-4250-bbd1-d268b235eac9", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -423,109 +469,47 @@ }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "24c769ed-cecc-4444-b539-8bdd01fe1f93", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务类型" - } + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "0594f4a2-0a12-4e0f-a144-a4f331054da7" }, - "ColumnName": "任务类型" + "ColumnName": "总计划工时" }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "724ce8a1-3b00-4021-9147-d30b72d488f1", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460" }, - "ColumnName": "执行人姓名" + "ColumnName": "总实际工时" }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "0c4cbf0a-50b4-42ea-ab55-abd411093b26" + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "a55760ee-f371-4c28-8c88-55d55e896433" }, - "ColumnName": "工时类型" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "530229df-a53e-4a33-8c8f-f4705427b085" - }, - "ColumnName": "工时" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "8451aa5b-630d-4d7d-a19c-33b431c903cb" - }, - "ColumnName": "时薪单价" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "计算提成", - "GUID": "666c145c-8f07-4f6f-89ef-7d77e2d24403" - }, - "ColumnName": "计算提成" + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "cdaa64ff-354e-467c-9e69-29a7d05b5035" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "34445eb7-1e47-44ae-b29c-f5c3b6785126" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L2" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "2bb4e0ec-547b-4431-b4df-47669d4123fe" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!B2" - } - } - ] - } + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "0691f4cb-3b30-4cd0-8103-26736647f472" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + "NullFormulaValueQueryPolicy": 0 }, - "ID": "ee1272d3f7d148be98b767adca30f333" + "ID": "ae94acb2e997401fadb422a6f136b747" } ], - "ID": "f9265ab3-1ca7-45c4-ad5b-3b0c874e3d94" + "ID": "49445c83-33ab-40a2-97dc-584e245d7039" }, { "Condition": { @@ -534,11 +518,11 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目工时!AA2" + "SerializeProperty": "=项目工时!L2" } ] }, - "value": "人员统计视图" + "value": "人员视图" }, "CommandList": [ { @@ -558,7 +542,7 @@ "DisplayColumn": "全名" } }, - "ColumnName": "全名" + "ColumnName": "执行人" }, { "BindingInfo": { @@ -575,43 +559,33 @@ "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df" }, "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "df520f3f-bcab-4504-a8d8-5d3dae914e2a" + }, + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "11161dfd-418d-4b2f-a403-fd3a55983fde" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!项目ID" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "c2cccfb9-3431-47bf-8da0-74ff61e27606" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!B2" - } - } - ] + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "11161dfd-418d-4b2f-a403-fd3a55983fde" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } } }, - "ID": "423975ad0be54effb47397a2063fcba2" + "ID": "0ca30518e0c24ec0868448c038d1ec42" } ], - "ID": "efbec0d0-4663-4a32-a49e-b0da56457fb1" + "ID": "14f05650-e758-47af-a969-3eef58306edc" } ] }, @@ -630,6 +604,28 @@ } } }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "日期", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "key": "abc74a0e-25a6-4b9b-9cab-4a4bad475182" + } + } + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -648,25 +644,89 @@ "filter": true, "multipleFilter": true, "showOverflowTooltip": true, - "key": "17497400-e0c4-4366-89d6-33e31abc98b2" + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" } } }, { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总实际工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总实际工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总计划工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总计划工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总核定工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总核定工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, "Title": "加载中" } - ], - "Text": "查询", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/047_search_8.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 + ] } }, "3,1": { @@ -779,7 +839,41 @@ "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", - "columns": [], + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "align": "left", + "headerAlign": "center", + "key": "e616fdd9-6122-4ac4-ac2c-e7e6f47f11ec" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总计划工时", + "label": "总计划工时", + "align": "center", + "headerAlign": "center", + "key": "abba2432-3191-47d6-aad5-3555abf1dfa6" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总实际工时", + "label": "总实际工时", + "align": "center", + "headerAlign": "center", + "key": "9248be33-cd39-4d85-9241-91901ffd7543" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总核定工时", + "label": "总核定工时", + "align": "center", + "headerAlign": "center", + "key": "d2a0a8cb-6a0f-4dbf-a3b1-165603525ce5" + } + ], "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", @@ -799,13 +893,6 @@ "sumText": "合计", "size": "default" } - }, - "5,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时核定方式", - "GUID": "2c63cef9-3953-4125-9367-3dcca8671612" - } } }, "StyleDatas": { @@ -814,57 +901,35 @@ "FontSize": 13.333333333333332, "Foreground": 0 }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, - { - "FontSize": 13.333333333333332 - }, { "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 2 }, { - "FontFamily": 1 - }, - { - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ "black", "Body", - "Right", "Center" ] }, "CellStyles": { "1,1": 0, "1,11": 1, - "1,25": 2, - "1,26": 3, - "1,27": 4, - "1,28": 4, - "1,29": 4, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,35": 2, - "3,1": 5, - "4,1": 5, - "4,2": 5, - "4,3": 5, - "4,4": 5, - "4,5": 5, - "4,6": 5, - "4,7": 5, - "4,8": 5, - "4,9": 5, - "5,1": 2 + "3,1": 2, + "4,1": 2, + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2 }, "SheetStyle": { "FontFamily": 1 @@ -874,14 +939,23 @@ "1,1,1,9", "3,1,1,9", "3,11,1,28", - "1,11,1,8", - "1,35,1,4", - "1,26,1,8", - "5,1,1,4" + "1,11,1,28" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L2" + }, + "Value": "项目视图" + } + ] + }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -914,7 +988,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目工时!$AA$2=\"任务详细视图\",0,1)" + "SerializeProperty": "=IF(项目工时!$L$2=\"任务详细视图\",0,1)" }, "GUID": "b6b4b68b-08cc-42ce-a005-d99ef29be911", "StyleInfo": { @@ -936,4 +1010,4 @@ "Formula": "项目工时!$B$6" } ] -}//8wiYoF9hDITqXz9OKXZcRiaUEoaCjKRIO5FQHxsHVGTPuqq2UB6M+TrJrXdpSv5E9pwRpLsXOY/ZcapXw9hrGiF0QM+4ZipS6IjPN69XaLXPXPx4s5I1/mgAb1koMoESSosO1mYa2NHhGXLuvUPv8KZtQ/Kxzs7aU4mGf46W7UGa/jPXZGA36eAIQLeHxSCtEOYI0Dn4qD3V5ztLXrOT25enjX9kad7w+jI5RRV/nxnhw5D3vD1nFNOUTtUzzFw6yJO+1j7hn9IoX9jyTZ+24WdNM7rqM36yXqLynXAEd6M5sR3HlvksARNnKROInLEwlvhOCUUFddymVDduwgfFylzrkHk5FjSlWPI0L/RSUSChvtDXs40ug80TL8MTQAJL5U3AZtoHw0le7nhaUACsXJY0NpDyr1U20sK31FrvNKUVtA0fm5ffl1h9z3vLrMq7fM5D5ZR9JBQ/gn4rvlSwSGdyibC5t8UWl+yupJkdBUTn7iuj3T7t3XttjgrVoix95TqBBQEG2UmBxfNnSUuRLVmZ4m4I4NcNompaX20erM2NdBQQss/tRsPTUsI/BuXyinMr0bGlASYBWXk/LoeqmZzjIOK6OHXkU1myW5YvsEM5nGRaSwheLSnUXgMM4BImapecfy6jwtcchAGCeK8mdU8ZgjS8v7InU2gql2ciwxlmcHuqd2RLmeJXM4o7unPDDMzPKRd7FUbMS3dULBIcSDncyDf06e1Dzx4UAtfQHkEr7vj+nyZ1WCvSNWZC73RMDd/07wo6qKZBw2UpvdNYNWaRWLXQ6TChSNzj3qv85xx8AYXdy3b7+vm0KeZfTAygB25F7Z0QBoGUqF0TlywuPxAdcac6N3MiTmeR8pQ+V9OWmsEw+9XmTx7nkTVqd0MmCb4GNc/1GSv7FO+SI0Bpyg==|920 \ No newline at end of file +}//NPdVgn4Sf4GpXH5lImBPxZ1WWVrTMnnKJiEtbtic9cif1FsYmnDOqnp32xDb46hD3su/LLmtZhECNcVQe7xvX7Iaay0VoDe3MVyYjSsEA4qV6+7lCUhJQmfJZNiDaDrqWe2vPixM4LkjYdpcQsy72adLjrR/sa8X2FhcaUCQ/50rxaiqp/LWZ4smGwvtUlUH+WChiPDysjqlUk2LDWEyeeF5CUa4KafHfUb1LS1aiPQ1hZnIRafgCnRa4xwz+DsICFP4Z4b/r5Pm0RG6HBct9daocRm39GB3iQeQMkpPCdF+SfXpxAhRtPBcmQS3HnDdod0lkMROLkSRaaF2aqv0D5oOQyqva52Dj+0qYV/nda+0cPq0NsorIT+PuKToZFUmdbwFIwu/7zApzKTfyxQuSRWmc5N9veo+Dosq6BDqA16mP9IJr7lxxYJTy9PMDEPY3ptU7j5An1Hvl1Bw1xsK/m7JEtrE9e783Ufrmy2W950dzqwnIx/LR6CZ7F0LSfvVih9LwkLPjE7dzsZtoqVFit1PUJi23NoLVx9O/V5U4OHU07uYowA1GpWMzTbnqbMTI1Ubk2Sb3gy2tUmgVScOZ6p3q4t3NwBXrm3oPn/hrzd9RhqIR/eNqnGdoogrSV2j0A8q5VO62dUWoVlN2QK4wlLXRNvyHoZQFsBj9ocDj12ihq0wb7g8eS95gi6pPm7WTd3g/YUpnHQUAV6wsYxGWPRTAB1o/wasbWbsYIsLnp65qmdtK81/efrVoHP2ZqGXC7Qhc1DGlACkFMBbngdOcCvEdvSuTvYM6Q1fUXHzNWuPFEg6HOar1TLqbS6B8yJ+zt/K6snoiPPigx95XkwAR0v9aHmiLP+Vg2qC/Cp9qhnSWqkDoOhqYybtwQS2/1eBJZwQ5630ftZvB7TMRV+hhg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目工时.rd b/Pages/项目/项目首页/项目首页-容器页面/项目工时.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目工时.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目工时.rd diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json new file mode 100644 index 00000000..20329e37 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -0,0 +1,1011 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 642.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 6 + ], + "Count": 7, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 41, + "DefaultSize": 32.0 + }, + "Values": { + "1,31": "添加岗位", + "1,36": "添加成员" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "bfcc082d-45d5-4a9d-9ded-1ec7236429a1" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "336ad858-d1b3-4e54-897f-89d8c7a54290" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "bedfdf40-dcc2-47fd-9b50-9973bd9c0c0c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "筛选岗位", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,31": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目岗位详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加岗位", + "TemplateKey": "_RS_Success1", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "1,36": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目成员详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加成员", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "4,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "6899a8cead694b3ba00307b6756dbd7", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!B2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!ID" + } + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪", + "成员数量": "成员数量" + } + }, + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "ID": "ID", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪", + "成员数量": "成员数量" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "c7c71cae-ff61-47fa-b1f7-1886fb5eee22" + }, + "ColumnName": "ID" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "457a678c-4210-4418-8bc5-eab7e28bdd4f" + }, + "ColumnName": "岗位名称" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "78670928-d30e-43cf-a473-e9e04ade58b6" + }, + "ColumnName": "默认时薪" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "成员数量", + "GUID": "b32d70ac-e239-4649-a6c9-2628b672f3d2" + }, + "ColumnName": "成员数量" + } + ], + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "TopCount": 15, + "IsLoadOnDemand": true, + "LoadOnDemandCount": 15, + "TemplateKey": "竖排无样式", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "4,12": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "=项目成员!Q4" + }, + "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.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "1e37c9b1-65eb-43c9-8c4b-07b0b16f1d9c" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "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.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!code" + }, + "BtnText": "知道了" + } + ], + "ID": "323013d0-3b34-4464-89cb-e981ae57b7da" + } + ] + } + ], + "ID": "0d01ee0b-c354-41f0-8eff-eecaf8dcd70d" + } + ] + } + ], + "ID": "e159eb72-ff6b-4fd3-b7d5-03b027a0d6ae" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" + } + }, + "PageName": "编辑删除页面" + } + ], + "ParamProperties": { + "项目成员": "项目成员", + "项目成员_全名": "项目成员_全名", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "5e6ecc70-0b8c-48c2-ae52-b26c7f580397" + }, + "ColumnName": "项目成员" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "eded767c-dd09-4323-a133-72d59d357da6", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "项目成员_全名" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "2b7f920d-dae0-4573-8cdd-9595f6750ef5", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "岗位名称" + } + }, + "ColumnName": "岗位名称" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "15b189a0-94c5-49c8-a051-80060a288837" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "8cb2ca64-f5fd-4a20-8c22-d69ea1404c95" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!B2" + } + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "FGC_CreateDate", + "GUID": "0b2d493b-818f-4d46-b6b1-b93a3eb7b4d1" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格2", + "DisplayMode": 2, + "TemplateKey": "渐变卡片", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "6,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb" + } + }, + "6,5": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "395bd1bb-03c2-4ee2-8335-15164ea4233d" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1 + }, + { + "FontFamily": 1, + "Formatter": 3 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 0, + "BorderBottom": 0 + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, + { + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "Formatter": 3, + "BorderBottom": 0 + }, + { + "BorderLeft": 0 + }, + { + "HorizontalAlignment": 5 + } + ], + "Types": { + "Strs": [ + "black", + "Body", + "Right", + "[AUTO]General", + "Background 2 0", + "Center" + ], + "Borders": [ + { + "Color": 4 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,10": 0, + "1,12": 1, + "1,26": 2, + "1,27": 3, + "1,28": 4, + "1,29": 4, + "1,30": 4, + "1,31": 5, + "1,32": 4, + "1,33": 4, + "1,34": 4, + "1,36": 5, + "2,1": 6, + "2,2": 6, + "2,3": 6, + "2,4": 6, + "2,5": 6, + "2,6": 6, + "2,7": 6, + "2,8": 6, + "2,9": 6, + "2,10": 6, + "2,11": 7, + "2,12": 8, + "2,13": 7, + "2,14": 7, + "2,15": 7, + "2,16": 7, + "2,17": 7, + "2,18": 7, + "2,19": 7, + "2,20": 7, + "2,21": 7, + "2,22": 7, + "2,23": 7, + "2,24": 7, + "2,25": 7, + "2,26": 9, + "2,27": 10, + "2,28": 11, + "2,29": 11, + "2,30": 11, + "2,31": 12, + "2,32": 12, + "2,33": 12, + "2,34": 12, + "2,35": 7, + "2,36": 12, + "2,37": 12, + "2,38": 12, + "2,39": 5, + "3,11": 13, + "4,1": 14, + "4,10": 14, + "4,11": 13, + "4,12": 14, + "5,1": 14, + "5,2": 14, + "5,3": 14, + "5,4": 14, + "5,5": 14, + "5,6": 14, + "5,7": 14, + "5,8": 14, + "5,9": 14, + "5,10": 14, + "5,11": 13, + "6,1": 2, + "6,5": 2, + "6,10": 2 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,1,9", + "4,1,1,9", + "6,1,1,4", + "4,12,1,28", + "6,5,1,5", + "1,36,1,4", + "1,31,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目子页面" + }, + "Title": "加载中" + } + ], + "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": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目成员!$AB$2=\"任务详细视图\",0,1)" + }, + "GUID": "f7355555-9eb3-43e8-8fde-5cecffe691be", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$7" + }, + { + "Name": "当前岗位ID", + "Formula": "项目成员!$F$7" + } + ] +}//7yB6qjLPffB3B5JkMteLHCK/aDHtZpoZmAKNObPaEuOU7b1CxWUyZvLgWMwpg+Hespf5VagbVyG9ynTwr2BMvDLZFXlOA7cxnOaiGumywwuSFyd+n6ZXSVYhSVzFPXoAqxzjfP8hOVsNSw3eO5rrLXttwSPDTpWH/CsBg1Z5e625IlTJdA5vRYhObeiTjCmxfyBHCqhPvtnyffHI8ruQl3uQt0VUwRoOk8WCBaCWfTgF61nkZKSjDVfm32Utnb6W7lAiPMGeuBcnlz+kRcmJxY1cM7lDQcEJLZBxyZRajSKn3YzREMPsWFNfEHoHtV8JJuw19QRpl3SrBPonCd92TNPt1yZRibR3l2+BZHF2kgMpRzO5x0O94DAZN/SH4cgVbVfMtGYvtpgGpsjQX2C96IW1wvuLZJOhmiLPSx4X52xyNH7X7TB4kjdRMPpDdqKPmBcdoAbGFVWUAAjPdRvCSc0JZjW4yCNbgefhSRgvJ5/5QOr+ZEHTRFhwH4zFIXzgs6ZvhFLskckZk4sKU5OXuUz79oKxX2uMP6lkG9wLBXX5OuqQ4HEDs9K7rCgvu2gVePDKINWnsaQ/ksHhTuM2YDxyoenSx2TfY0ebFyZdO52HKkXXAcdfapksLVfIXKwsKk6manwnpXQaQ6hH593C6mrQDJf5Avc1SrBiflfAZDm4cbZsKqFk8Cw+mpvc7F5QZfxk7xH3wQmfFhlGUb7BIdukrHKFUTnM3i7H77fd8v4p0dq5jhWx3nYCEHBuCPY9yqL4GweGLkUE+zRmjZ3hQcRqcGy0CGqi4cwhJDuEuoL0tGB0NCJGRJ8hax262ZbBCrCrDqX1OkJ5AM8OwVr5vX7eepI5WKXtaOJVAV6HZ1ySPW7WfLlqRo3Xf8/ZtzkJInjYgjfRjfeAb02m9iiGPQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd new file mode 100644 index 00000000..df8eee82 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 41, + "RowCount": 7, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$7" + }, + { + "Name": "当前岗位ID", + "Formula": "项目成员!$F$7" + } + ] +} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json similarity index 64% rename from Pages/项目首页/项目首页子页面/项目成员统计.json rename to Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json index f38ea99a..023c9f00 100644 --- a/Pages/项目首页/项目首页子页面/项目成员统计.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json @@ -195,7 +195,7 @@ "DefaultSize": 32.0 }, "Values": { - "0,0": "项目成员情况 (实际工时/计划工时)" + "0,0": "项目成员" }, "AttachInfos": { "1,0": { @@ -205,83 +205,55 @@ "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", + "TableName": "项目成员表", "BindingInfos": [ { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "a14f7334-4346-4b3e-ac2a-f3ce7da6bc80" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "6f723216-2937-46fe-bbc5-e9b760557f94" }, - "ColumnName": "执行人" + "ColumnName": "项目成员" }, { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "ea960229-a6c2-4278-9c58-aa3b7f5f02c5", - "RelationBinding": { - "RelatedTable": "用户信息视图", - "RelatedColumn": "用户名", - "DisplayColumn": "全名" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "01e23b43-a539-4397-bc6f-4723ff061640", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 } }, - "ColumnName": "执行人姓名" + "ColumnName": "项目成员_全名" }, { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "3f3675ae-3007-4159-b793-b9b07e827d35" + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "2e6de542-02d4-428e-9177-68802cc9f20b", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "岗位名称" + } }, - "ColumnName": "计划工时" - }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "760c1a1e-2726-4727-b6aa-6138afc61c7a" - }, - "ColumnName": "实际工时" - }, - { - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员统计!实际工时&\"h/\"&项目成员统计!计划工时&\"h\"" - }, - "ColumnName": "工时情况" + "ColumnName": "岗位名称" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "36d1a996-4e85-4b9f-8d68-8f694ca5292d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员统计!项目ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "099752b6-2bd0-4db8-90a8-e53e53498fef" - }, - "Order": 1 - } - ] - }, "IsListviewDataSource": true, "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格1", "DisplayMode": 2, - "TemplateKey": "渐变卡片" + "TemplateKey": "渐变卡片", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } } } }, @@ -336,4 +308,4 @@ "PaperSize": {}, "Margin": {} } -}//MF5iqTIyb+ULR/fHXQEGdbm0ylNoBDFaBS6oSWF5zONvuCj5uZvbLpiQnH4XqDxv8lcdxKSDzeMiH7dJOVPAbSXi9saB8rOnCRfel7f/DFiESrgnzGyLi4tAiEAmOoezuW+RpnqdKcNfX0cO7sJec1JrUWlyvAFMOG/lbHnnCrJW6IjIpKCIRzwa3So6FlgU4Jp5S3vzRIayWtokE5SKbiZp2tTZ4b41lODekhMtC25C5jToGxR5RsQFo1UZ4BYkLu1Bxib1/jIwtGedW1MuCOXCP1iTxDFHKc9SZi7kFXKo3IXmuP7efUsOIz1SEhv+6fp+Nwo+Ctp7MPe9gP9AT29kvRdjcUPPR/lx/csnLKTwq7N4n0lYq8qXiK0Xjs9ziNnwZNdNC22qhRwj67mwOPFuIzBo74HkUbItYXFVAV8Sw8/B3wtL5GRVbIMlAdh5kzOC12WxyFckSaIp9YZNugDNRf+0AcAL7Bmht++f1rGdjr1YvvZOcy/DdSfEnlu5y4OLCCHJW7gcuqPJoyVI618tn7XVVsgfTjg+aQJEnriMz7liTZiNLPzVj+pvmpzxt2i6s1teLu+LGRI/c9RRp/aaXgeNB3zE/c5Jw9eJL0ouw6ltQdRE0Kq/m0QcdbnqSnunHBYCE0IqvxxFj0jkVjgDUlPY78hmSVrnQT4MFjrVQiwvZ63pQWWzvkwH+zwmVbg6s+F+pzapx0SWnj98Kbw6VGC8G/m3OQ/vUKBue12Qt2QEjK5FL7iXeW3v3PQS1x5oWhuyUHmXC+lyG05F4Cp47Fp+M0fwKZBqMHN5/eDQFeh3B5sw/Q/SHyUaBKkQ7DEAyL7jQ7hXscStvAqfG25HaMMJ4cvnNYVmp/PPM7tNLEzwsmoDXWL70vW0QMcXulV6oDA3zwggX+DOKG/mKA==|920 \ No newline at end of file +}//5gWfhzesbAKK+7iJx725CJzC8m+o+wYQzoAL9dyxYKGUZVdtT4F+N/Ara4AY85y7+77brV7KGy9FfeRJYDHkYQjWf1DZFr7y6SFu+kerGJcQkYFPnSwTgmPy0R7KA/yFO1m6JLgyOrAq7m4YEobso8nO/VhleqfrL/rufLVZOdTb0u6jfVnvl5Sm0JPUVztb87ie+gsdBCjkx6elRnf8hKkRF75XefIOOqTNIJmS+jxk3kAzjjuJr25p1T0PUjXNS4k88jec1nBUUpdUnVvPOzy9/9MkOJe20alF3G19sXmmnRA0qpCT7ObCcqu3VRyQgosBW0YzjCLAwTQ63GLFiGW88bgoSit/FdUEbGC+oc+9XWpuG4qJ9MOYTjsyWHmdrogYEBiP3F4upkR9eVtsuAWc2RN+JChRt4GrAFDaiHKO5w6dyhrtbLVXCEla29v33jYh2pKNtq+dIHaS1GIMv7PT4E74y8vzRkujGqCYXniCHrV0KCC9TWEji0iY+dHRf8CH3K5B4zH2muCUymfIzro4y++RUzM6cqbnViP9IsXu1kXfrFMvXgVDlfFbr/cZuB1RJtTmzYkgdM7hWAjvHcVMH0wB+Rz3T1igRlPbwhNWD00STnIFKYOKdo7EXtnuSBYl0m4S8I8dHzMg0rJSlOVXJnVyF4MIV5SSMChOLZlPOOhlO1axDzL6Be22WLw6xYMywSbPAgP5yAeX3Xf498OK+Gcnz/JhwZTlKzSarjy34fkgdAXw+FaaiJ7MRiaFhqHsdip1T2ibnU/wwWq9ZBnPYuR6WFXMKzvVQNboBGdJyA5J7AzmNmY1s82CzhsG/ddp3B7aaaCxSU1R10KmjsxrQNpaxSpbBrVipjnunEaO/bB/BegFYKPRpapR4TSOM7FtnEJL3VIKcPtM/k47vA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目成员统计.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json similarity index 84% rename from Pages/项目首页/项目首页子页面/项目概况-关键数据.json rename to Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index a5f78f7e..942e05dd 100644 --- a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -20,17 +20,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 - } } }, - "InLogicalVisibleIndexes": [ - 4 - ], - "Count": 5, + "Count": 4, "DefaultSize": 15.0 }, "Cols": { @@ -240,20 +232,19 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "成员数", - "1,11": "任务数", - "1,21": "工时", - "1,31": "费用成本", - "1,41": "工时成本" - }, - "Formulas": { - "1,19": "INT(V5/X5*100)", - "1,9": "INT(L5/N5*100)", - "1,29": "INT(AF5/AH5*100)", - "1,39": "INT(AP5/AR5*100)" + "1,1": "成员", + "1,11": "任务", + "1,21": "计划工时/实际工时", + "1,31": "预算金额", + "1,41": "预算工时" }, "AttachInfos": { "1,9": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "任务完成比例", + "GUID": "aa558919-f6dc-4a6a-9649-fae4d1d1cf46" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -288,7 +279,7 @@ } } ], - "ID": "e58dea71-0c13-4afc-96c8-d7da48a4bfd6" + "ID": "b6668b7a-ee2e-4cbc-8e9f-a7d56be44728" } ] } @@ -298,6 +289,11 @@ } }, "1,19": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "计划工时使用比例", + "GUID": "99fdb20c-8ab8-4b1b-9fd9-e840512df836" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -332,7 +328,7 @@ } } ], - "ID": "288b4725-f3fe-4210-bcf0-d6dff176f16c" + "ID": "e4350bc3-4cb0-429c-a005-5e799772160d" } ] } @@ -342,6 +338,11 @@ } }, "1,29": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "预算消耗比例", + "GUID": "6e711788-bf86-4561-8bad-cffe6587568b" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -376,7 +377,7 @@ } } ], - "ID": "a6063dc1-a2da-4682-ab96-ddeaab9ed183" + "ID": "5a187cb7-516e-49f8-8a91-918bcce57961" } ] } @@ -386,6 +387,11 @@ } }, "1,39": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时消耗比例", + "GUID": "74e00eba-defd-498b-a6dd-fe03ccfb87e8" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -420,7 +426,7 @@ } } ], - "ID": "de45fe97-303c-4de6-a2cf-883d28fbb4eb" + "ID": "9c10f9e8-0dca-468b-9581-e026bf9879a2" } ] } @@ -463,62 +469,6 @@ "ColumnName": "工时成本情况", "GUID": "27bf41c1-9428-4320-9df2-9dc4c5275d30" } - }, - "4,11": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已完成任务数", - "GUID": "d65a8d37-e524-49ab-bd49-86f13e503225" - } - }, - "4,13": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总任务数量", - "GUID": "c2a48ef7-1357-4541-be25-0091b8cebcab" - } - }, - "4,21": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总实际工时", - "GUID": "017c57f9-de51-43a4-b62d-0c798a61297b" - } - }, - "4,23": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总计划工时", - "GUID": "a34f34a5-44bc-49df-a52b-254f1bf422ca" - } - }, - "4,31": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总成本", - "GUID": "2e8448b0-962e-4b42-bfca-93b8a6b5110b" - } - }, - "4,33": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算费用", - "GUID": "9648660b-0309-43bc-9ba6-4cc52d9d276d" - } - }, - "4,41": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总核定工时", - "GUID": "a831ff86-744a-4fa9-9da1-af1ebc16ae03" - } - }, - "4,43": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "ec9f7b3b-7abe-454b-9f88-6a09f721fcfc" - } } }, "StyleDatas": { @@ -598,32 +548,21 @@ "1,44": 0, "1,45": 0, "2,1": 5, - "2,9": 0, "2,10": 2, "2,11": 6, "2,20": 2, "2,21": 6, - "2,29": 0, "2,30": 2, "2,31": 6, "2,36": 6, "2,37": 6, "2,38": 6, - "2,39": 0, "2,40": 2, "2,41": 6, "3,29": 0, "3,30": 0, "3,39": 0, - "3,40": 0, - "4,21": 0, - "4,22": 0, - "4,23": 0, - "4,24": 0, - "4,29": 0, - "4,30": 0, - "4,39": 0, - "4,40": 0 + "3,40": 0 }, "SheetStyle": { "FontFamily": 0, @@ -637,17 +576,9 @@ "2,31,1,5", "2,41,1,5", "1,19,2,1", - "4,11,1,2", - "4,13,1,2", "1,9,2,1", "1,29,2,1", - "1,39,2,1", - "4,31,1,2", - "4,33,1,2", - "4,23,1,2", - "4,21,1,2", - "4,41,1,2", - "4,43,1,2" + "1,39,2,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -744,4 +675,4 @@ "Size": "250,79" } ] -}//iG4j+opImZgua6uF6UN6QM2S23D52I0MxyCq5HyKM/BYsT09lktEmPAjoXnDttqljb6+ZWsPO5Q2CtF72yBgssxSyUue404wJKdk79EzHzmGr8gKoSYyFofD1ve/y9YFNo4Qq6j8DiaEEbfVdXS+r++MYb392a6TfYoVnyXqQO568VcQhEPE9U/8fKhbSL6i87z7B+lnIHS4lYdOdkjonVy9Nl7DPWr99byviKGigG6VjM+vvKkp8FWgJRpLBMIlx5NRvju8i3Ixq4DJ+ltCpt+VgLwVGKSn+MQnOx/EE/oryARYC4ci8djML54hhW4AUhPOoT4OPvsK5SyjxcbhpF4PcKTmotX8KdY+zEdlcjPjDKX+JG98A3keZTKwQmWrtWI4MGGVGkMHNzUdaCWB734gLiiclrkGBsD9YtDNJR355vN2KLKnsGt6RskD9C9//PzwAODzjkBETMQdM4xoRUTvQNYauZvwkV6UzF02pLWscVHH+bq3BHi27cOZk76ZDR5l4rRou7b2PhhAsEibU+jnnbl0Bsn9rt3GdGN6syK0fq4/Y8wp6aHgCd4NZSR9BDS1RlvmszN9vOi5+4Ipk2yx6Wl6sHelZz8rB5bcAKkCwcyZTcIRpL0y5gTDnfyUwKsHVnngN/PqR3bwGBHQrlpjfZEvUvwrKBDB+9BmTmbu/9Fgu/XOpjH0jzsOBKEMrbNCU5FX8PHP42yriLAhJXTErMYcOzof2O91u/1L2uEV/ysUmSgnuqt2JUXwnPFX6PN4AMlBjYhHHQfPO4WY6fPKz2mjBbkHe1fU9ac9LL1BQ/Iu6vuPZHciq4bgVACwnRIR4xIkxPZYBJSd0wftRzFEC/yfe/ZB7BMQSIyVLl3jshFkDqjqqgHj0zix5MWdG0jatNJW9PYZa5Nr1didZg==|920 \ No newline at end of file +}//q0xpeSoqcRrnry0tnkNT0woxqWI6lJZ7zIJWMr+0IO8ADzCGDqsXqKxK13yeWK+3EhFUPM/8R5kH9fEhcdyElh9c+JvKl9USGYsCUIVotMrHirkhupaI33A0vjTUHLSMFJX4Wu1YghqWUid6qju3C8hLClVuaH+Al/qwYQLG6o0j2CxDKYsYFVpm6YI88DgBRDZGOXvOIOtMvJ11/4pZkZAZ9pe7sArspydV/39r+M60QMmIzoEHgt0fc5tu+0YupJlQZmz+mzGdOZmS3W5vGMra882cgQft4/DGEtNzB1yRuT/QNR4lIyyWqpwRUs2dystqLBm4SrMYwPHm3TaaWqKHX80/BWhVgmH8O80BSugLTiDJ75oEAQ5WNQkZSlMRtuxyeiBYfZhB/7WIuwoXN/H1KKwzedY2JoT8jpj+kkznJT/33OkH5jBvH4VQb99+vtAaI3GZH4MD69Mlhh941lZmdHetTwtiO+AjZeTPQuCgEDgFzufJ77cCt32ya4BRHcN8k35lFojHqkiusnLQHLdnEyapcbLo8qMxK7tMiwLaErfAJ4ARvzgskc172pXJ+/1C30KNPyyhcKuiro6ldYIrJmg0U3UVQW9p85+lSCLM8vnpQdnF9zoV0pQMPueyJiIFBa7o10Ye0FBej5DaRccK0YgtRW6ADKPiIkAdJZKhR3A7NMDJPBHehpaqNrS78Th6aHWDrFqP+HR1UmGWj0xPh7PBY1Ghp5y02tToW0zwcjfVYp+jnr9jlJD9754iv7X++fij+5/Up0nnDVSrsC2JiE+61zfdBfX2bEmr2UeHhXz3JJT9jfIQbU5E9uckmHR2Lobk1dCzxaEkhfGvRiM/crioxk3M62cVXDjvp3anp1RY6/Z7kqVq2AfMOXe9b0SLeWK4GRrCzHKCzK2Pxw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd new file mode 100644 index 00000000..4cc0f485 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 47, + "RowCount": 4 +} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json similarity index 95% rename from Pages/项目首页/项目首页子页面/项目概况.json rename to Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 02352451..71b36012 100644 --- a/Pages/项目首页/项目首页子页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -351,10 +351,9 @@ "HorizontalAlignment": 2 }, { - "Background": 3, "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 3, "HorizontalAlignment": 2 }, { @@ -366,7 +365,6 @@ "Background 2 -10", "Body", "Center", - "Background 2 0", "Text 1 50" ], "Borders": [ @@ -801,4 +799,4 @@ "Formula": "项目概况!$AG$2" } ] -}//W4MSBUkpsYNxSG/XwsyNxf/qJG2UlOzC357gW76w0N8i0T0TfIBkaLhDxvWDzQuaUKBONkN91VmnY9uA7VWKam0TakpEoDCUiyDyX//R2m6vueWw6sHG71SmdeW5k/ls29NETiIrCAdMpxy04/ZZtLkz4l0CIzzh3HZIneaLGx5Btyk5Zv7gJwxQvb89ZFtszIEk9vLcjDzitKPrahudSjGYMoi5YHhYRxhsbluanicxhNp5XB5cSeq5bLNAPGtULHBP15ci2luvzHMkQg9QcRC2T0kTXaiAjENKO4RDA9CYjLsQjOkQdNs5YSehXzvtSHE9CCK2KeCDTrG6xf9uL3lQ4ZRlYAd0awcaU3Br41FMY+Ry90LOty6DiaOuht1I035YPZM94C33EWhulnWDCMlouBiJ0qrUWDoI8KToKLm7DqSka8d5QFjlLih/71zjMbVafAe/RDl3kmhqGVvo65ytLcZ8C4VOWi1nbvfyza6wOF+L/BwMjWNWCCohKKcxqo+bpxMnfpsUCOERZxX5cl99hxDGpme9/xrekWiscibhM8/A36UXW9UgHq997prqX+Y8LpFqMQMKlnihH5rBsgDyQeCfvKfd3tGfG6k1mWtm4C2q/xk8peYcBW8FabNZmUcCHojLWFTCW+wBc1l51KWQp9gJxoGA9Zrhim6ksRpu87RxK+XAn6fjdk97qPhc/8InRXXqSgJvjvLSey2dpopqTsF3EsvKZE6eEG5Zw2/szCVjHikB94LMtCe7qjvlWE0EnOb0lo3AdHYQjE6m8dZAEKXWRx16kBDK8mNn878gX/thhxdgtNnZhWxboTGv+r6hyixjfT2FiTiZ5ihspiFCdtf38OfB0PKZFnfVuuaius6kaAxdG/YIsMKWSM4URn6LBhQvEJmjQUubw0isOg==|920 \ No newline at end of file +}//MF04xyaPCj0TV0GFm5hdq+QePRcJbTstf5K6K47zTNTP7sBZ7pT7jnGlsG8rfv3wJk/lXRaGKVtn/X/Usn5XF9WVuCS4y5TvxVNEm8Aoc7optgsGv8IkYwdd1ngjr69p7tax9fMzMN3aFXevVjZkMQ2fOsEjdL+8uuVqQrm+tphokvU1SvH5PYNAaOEdnnih7Gomy5pknu+r8UmOL4RpJPj6YOrnJ7SNPf44+Tv+HWKnAvM9sz5vCiQ+wLUC6iOVapewu+ChBaSqhBXu3/Hf8Mr0Lcesp+f62LvnkdPxDCNJTOiCof/N6NbsyRIRfu9wGyprJODo7JSQlBZSMDnL0qggb5UHOu/MM2RRiAtWGP0pX0LA6M6ZSYrXup7hIddsRLhnnwVUEl4BiPXC0ImSZuu5BJ6jxOx2VwZSsluq7TQk8mWdAmvfG0Ylge18kvOOvIc0/4QceooNDvw2kl9WUn11i78a8Dqy2Os+vsxQgPuDDKsalHHkmDgU/P+RCnHZPBpPBQBQ1zwdBYsUnH0z/tyQ1p/ZYHLX85CM0O56m18Etcov9k6p+fnqrUn1HJUxq8qc+dYGCuu2y9OB6880dGT9vHDYGoFT/2bSlakhzvxO+hTz0swNTNok7tx5h2Ra3hS4d56vGFcxE7rR13Q88XBiv0MtCkQndPTbk5qKZVFo0dI0+9ZqGyQpXD+QzOKHZgZVj0wd0HUsBZ33AZ6wMgT6XREirZhGRY/AxSqf0xeuqAT4HYI27HTkF2LBfKLuJAE1JuV7v5UTYZxSXAtc+6yNKFdBiKmVBZOn0Gvf1EzNws/TuSpBWD5lSGxL8lmdPu1uT8jlhAToe6UrrOmRwzF4LMo18ARqAtCc1u61JfA0o0XAqKW0UrwMMU2pyBOMS69qMF2osLF5peL0KbebtQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目概况.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目概况.rd diff --git a/Pages/项目首页/项目首页子页面/项目甘特图.json b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json similarity index 83% rename from Pages/项目首页/项目首页子页面/项目甘特图.json rename to Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json index 6046026a..e27bb00f 100644 --- a/Pages/项目首页/项目首页子页面/项目甘特图.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json @@ -1,7 +1,7 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 347.0, "Mode": 2, @@ -13,12 +13,6 @@ } } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, @@ -48,17 +42,23 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } } }, "InLogicalVisibleIndexes": [ - 1, 2, 3, 4, 5, - 6 + 6, + 7 ], - "Count": 7, + "Count": 8, "DefaultSize": 32.0 }, "Cols": { @@ -209,8 +209,11 @@ "Count": 31, "DefaultSize": 32.0 }, + "Values": { + "0,0": "任务甘特图" + }, "AttachInfos": { - "0,0": { + "1,0": { "CellType": { "$type": "Gantt.GanttCellType, Gantt", "GanttListViewInfo": { @@ -246,11 +249,11 @@ "InitialCalculationMode": 1 } }, - "1,0": { + "2,0": { "ListViewInfo": { "Name": "表格1", "TableName": "任务表", - "RowIndex": 1, + "RowIndex": 2, "RowCount": 6, "ColumnCount": 31, "DetailListViewInfo": { @@ -268,7 +271,7 @@ "CommitType": 1 } }, - "2,0": { + "3,0": { "NameUsedInJavaScript": "ID", "BindingInfo": { "TableName": "任务表", @@ -276,7 +279,7 @@ "GUID": "506ec052-affb-4a50-b311-5dde9f2beee7" } }, - "2,2": { + "3,2": { "NameUsedInJavaScript": "父任务ID", "BindingInfo": { "TableName": "任务表", @@ -284,7 +287,7 @@ "GUID": "2d5608c0-bb3a-4545-bbcf-e12ae87f05e8" } }, - "2,3": { + "3,3": { "NameUsedInJavaScript": "次序", "BindingInfo": { "TableName": "任务表", @@ -292,7 +295,7 @@ "GUID": "7e12b30b-d178-4323-8528-d6630e90260d" } }, - "2,4": { + "3,4": { "NameUsedInJavaScript": "层级", "BindingInfo": { "TableName": "任务表", @@ -300,7 +303,7 @@ "GUID": "7575addd-67fb-4698-bcc2-260a37f54188" } }, - "2,6": { + "3,6": { "NameUsedInJavaScript": "任务名称", "BindingInfo": { "TableName": "任务表", @@ -308,7 +311,7 @@ "GUID": "e3f7ae08-9356-4a2a-8e6c-15eac159a32f" } }, - "2,8": { + "3,8": { "NameUsedInJavaScript": "执行者.全名", "BindingInfo": { "TableName": "任务表", @@ -320,7 +323,7 @@ } } }, - "2,10": { + "3,10": { "NameUsedInJavaScript": "开始时间", "BindingInfo": { "TableName": "任务表", @@ -328,7 +331,7 @@ "GUID": "26bfe21e-4d4b-4803-8282-478c95388b92" } }, - "2,12": { + "3,12": { "NameUsedInJavaScript": "结束时间", "BindingInfo": { "TableName": "任务表", @@ -336,7 +339,7 @@ "GUID": "9f4b71ba-d1cc-43d0-a361-9ea102f869f7" } }, - "2,15": { + "3,15": { "NameUsedInJavaScript": "分组名称", "BindingInfo": { "TableName": "任务表", @@ -349,7 +352,7 @@ } } }, - "2,17": { + "3,17": { "NameUsedInJavaScript": "版本名称", "BindingInfo": { "TableName": "任务表", @@ -362,7 +365,7 @@ } } }, - "2,19": { + "3,19": { "NameUsedInJavaScript": "任务状态", "BindingInfo": { "TableName": "任务表", @@ -370,7 +373,7 @@ "GUID": "ed3ad060-12e8-4be1-9310-ce9710779316" } }, - "2,21": { + "3,21": { "NameUsedInJavaScript": "前置任务", "BindingInfo": { "TableName": "任务表", @@ -378,7 +381,7 @@ "GUID": "62ca8ff5-a0a6-44d9-be23-e4d86597b233" } }, - "2,23": { + "3,23": { "NameUsedInJavaScript": "工期", "BindingInfo": { "TableName": "任务表", @@ -386,7 +389,7 @@ "GUID": "d5312461-f026-419f-9a68-7361b0102da9" } }, - "2,25": { + "3,25": { "NameUsedInJavaScript": "开始报工日期", "BindingInfo": { "TableName": "任务表", @@ -394,7 +397,7 @@ "GUID": "b5ea2af6-9c4d-4470-a8c7-e4cd92ac4ef9" } }, - "2,27": { + "3,27": { "NameUsedInJavaScript": "最后报工日期", "BindingInfo": { "TableName": "任务表", @@ -402,7 +405,7 @@ "GUID": "d19371c7-f344-4910-8d73-f549b694d0b7" } }, - "2,28": { + "3,28": { "NameUsedInJavaScript": "任务说明", "BindingInfo": { "TableName": "任务表", @@ -410,7 +413,7 @@ "GUID": "4b41dacd-aa78-4b93-8c3b-699f38f56e35" } }, - "2,29": { + "3,29": { "NameUsedInJavaScript": "里程碑", "BindingInfo": { "TableName": "任务表", @@ -418,7 +421,7 @@ "GUID": "6c233bf4-7a1d-427c-8ac3-e212f6b5813e" } }, - "2,30": { + "3,30": { "NameUsedInJavaScript": "进度", "BindingInfo": { "TableName": "任务表", @@ -430,63 +433,80 @@ "StyleDatas": { "Styles": [ { - "FontFamily": 0 + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1 } ], "Types": { "Strs": [ + "Text 1 50", "Body" ] }, "CellStyles": { - "1,2": 0, - "1,3": 0, - "1,6": 0, - "1,7": 0, - "1,8": 0, - "1,10": 0, - "1,12": 0, - "1,13": 0, - "1,14": 0, - "1,15": 0, - "1,16": 0, - "1,17": 0, - "1,18": 0, - "1,19": 0, - "1,20": 0, - "1,21": 0, - "1,23": 0, - "1,24": 0, - "1,28": 0, - "1,29": 0, - "2,2": 0, - "2,3": 0, - "2,6": 0, - "2,7": 0, - "2,8": 0, - "2,10": 0, - "2,12": 0, - "2,13": 0, - "2,14": 0, - "2,15": 0, - "2,16": 0, - "2,17": 0, - "2,18": 0, - "2,19": 0, - "2,20": 0, - "2,21": 0, - "2,23": 0, - "2,24": 0, - "2,28": 0, - "2,29": 0 + "0,0": 0, + "2,2": 1, + "2,3": 1, + "2,6": 1, + "2,7": 1, + "2,8": 1, + "2,10": 1, + "2,12": 1, + "2,13": 1, + "2,14": 1, + "2,15": 1, + "2,16": 1, + "2,17": 1, + "2,18": 1, + "2,19": 1, + "2,20": 1, + "2,21": 1, + "2,23": 1, + "2,24": 1, + "2,28": 1, + "2,29": 1, + "3,2": 1, + "3,3": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,10": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,23": 1, + "3,24": 1, + "3,28": 1, + "3,29": 1 }, "SheetStyle": { - "FontFamily": 0 + "FontFamily": 1 } }, "Spans": [ - "0,0,1,31", - "3,0,4,31", + "1,0,1,31", + "3,0,1,2", + "3,4,1,2", + "3,6,1,2", + "3,8,1,2", + "3,10,1,2", + "3,12,1,3", + "3,15,1,2", + "3,17,1,2", + "3,19,1,2", + "3,23,1,2", + "3,25,1,2", + "3,21,1,2", "2,0,1,2", "2,4,1,2", "2,6,1,2", @@ -496,21 +516,10 @@ "2,15,1,2", "2,17,1,2", "2,19,1,2", + "2,21,1,2", "2,23,1,2", "2,25,1,2", - "2,21,1,2", - "1,0,1,2", - "1,4,1,2", - "1,6,1,2", - "1,8,1,2", - "1,10,1,2", - "1,12,1,3", - "1,15,1,2", - "1,17,1,2", - "1,19,1,2", - "1,21,1,2", - "1,23,1,2", - "1,25,1,2" + "4,0,4,31" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -536,4 +545,4 @@ "PaperSize": {}, "Margin": {} } -}//MLIiD24S25Cde+unqusndsLatl7AGmgpndf8QEYJah6+W13T+1PFUTOcynXj1EKoZZro7Pcwcx3YStijS2yVMLwuZmMxEyWWcAFlwwVO/UmjWS9LqNS68zDs76XDzNr9yTAgL/XyadmoOi08fUXij+O0AgvDg5nVpXfjMMTDZWLTQUqKZGa2uVEonUGRejhyn6pMbap0pdELPSm7d11w+t6Gy04GeHP81rOkR8+qv1y+sdW9URqmz8Rp3wSGyiKDEh7cOWGhCbh6c8Jag9AdlBFvSihnwsIZmzNRMY756WpgdbU3R+zFo5vNZFtfm2opAE6Vd53fCfKYI+dcXNP+8NRh5cqKJkhx7UMj+vPPObjGqJjGzDH4QofiulMR38AXLbmmhfDmfn1MnO15XQcHyszBggRPOE05VGbEj3oByVM8FN9DLVOLup28nP61DblDLl6w89/PHdwhjzuXe43GUBPRqUkBGrzFXSl9PmClHQF0IoTA/skIpNLYRclVxbe5YjMVeFR4VG69OPfI2FD1SzssGQ8d2O+p1ojl3vJCkJktYwoPRjP0jebU8Ao9aahDMy/j51Vk4M1UT/fO7V7zujBfKEvojktaUaEQT3b3iNWVOPUDjiwkBkFtBVtQV2fkCzigbekcKReAL7KMnvYsLEssZ2zJ5YoDzC6iegXTGhLWHGxdV1fB/cb70Q1pqYYrtxD80nn67kdKOLuoxXeuo7n0/2POs6oimbFmXn1Eu7PE1yKqLUO87pKhB5H4boe8YFL8fkzwMuKIQr1BX7LFPBXR0Hn13yNFrkpzz37CcUBCOWKlw9VMgdc6OCbcvQcTa/jFJvBYTHSdZ47karXrZ2q8u0c4HJyAHj0wa8eOZLVWSxYn8E5/VKtw7yBWfk/E9nibu/LyjtoT5A2huqTysA==|920 \ No newline at end of file +}//jUkYGZPw78tOTc/hV7Lr4Y+Qcj1U3oUbWR2ghxzVxOtYY4KmKFQX7ap9U/dzkWj6vOyGEKZp8HXMR3OwEWMa+6Tmnyhjybnic6koGX+MXkUdS+09O9UE7mlkBHUgXOp8qjb4KxG65P77QBwDWtTOooARe64txM67vYmNJMnnfSSeMj6Mhw9rtajcJnmcQGwe+l7wP6dkIwqI6CWyOMNammaCgnIaT7Da/eB0BICG/1eO5XcK5Frejbo3JT1/1pGGjjPp/+O4PuUjQW5hUxucJe0GjTHjJelOvAp0S9DDzZ9DCo+s3dtEl/aLLGQ74OKE2fNqMtiZQDtYIObVgcN0WmFNvxvKk9kAX2raTwkqJVGEU/A73FeZaGn6ubJUX1tETtvan4MQigytLNwPLAd6xPyWpMkW68yvF2c0cE1cHXoYQip+rRPootOuTpL19Bg2kQNkN8s3s3B+hnbsIZn/7hGmZJCIliZwwAWAaa27X8+1yASJulVUf4THPkvwBenlZPBK+G1hWD/4iwVAAAwBYzlpXLbbqgQ2Lox5FNxyjcZQX3WKBnLtCM86ONbpAgVxNxonfFSd7pbPgYKMBhC04StZcBRl/Y7/Pbh3gF8sL6anNBJaOIfKnWXtl71EEbDLEaA/r0tr4+dvosV5o2/XkApUFJnPXpVSyZPRMs8y7/2Y3HJ2089FAQBjao2D8zWEXxcc6jVicCFsrLxCJcLeSCo7K7Of8sq4aK+tS8dUW0/JT68TSYoiYUYrk2seiQgod/ve90L1+V23qo1HFbNqbrOAz8Qwpzb/Yg1kvsphcTKO8eRzqlywN/3NO8+W5/ENtzdL3S/VIMoeOulnM52nR0/xfuxYaNE1qNGfeqCWoko9b6hAZuPFT3x86qMp7HVySuNwYMNdijoSjZvhHGCVRw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目甘特图.rd b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd similarity index 71% rename from Pages/项目首页/项目首页子页面/项目甘特图.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd index 0f485edb..33192dce 100644 --- a/Pages/项目首页/项目首页子页面/项目甘特图.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 31, - "RowCount": 7 + "RowCount": 8 } \ No newline at end of file diff --git a/Pages/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json similarity index 91% rename from Pages/项目首页/项目首页.json rename to Pages/项目/项目首页/项目首页.json index cda3a13b..56cf3028 100644 --- a/Pages/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -329,7 +329,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "38a728e4-94c2-4754-b08c-5659adb4030f" + "ID": "771b3289-6a3c-43fa-b8ec-0aca843ea1e0" } ] } @@ -471,4 +471,4 @@ "Formula": "项目首页!$E$3" } ] -}//XxW/2Ca/K9P3Pc05xUQsZ74NrBXrckOEB/auOvsNexBYh8IMEt8kbi3PjbW9w5a1PvVIq00FLrhCZVs1WxYYPb5NoQfClwwjnP7orpXlSFywrnVzLI9NHrawJBGFOQlVZc1e2+Ud68/pUonifzbigGyHnlhBj19LR5MuKSZXzxsdDPWPFl1Jzd/I7J3AwbbjY8Rixs67tSqriDQn30jrfXwIQ0nSXahodf/B5fMsOmMtR85wHLH8kbZ1P/lpHgInbI8TF2x31SMRLIo8jbD84jNFry+sE7xLMyTUx9XjnfFPZZk5kALx0UOsxoq96ksI3i76ayyIgsj764ZS8hf8FeEfw8vrtdrZ59Gpje75xHnyDVgCjKLXiZVRW9zryBoTQJfV4kewYHv9TXNabjxHc+ZF/LJiWxbca5w1SfwfLzPkrvMjg3nCwap8PSGb90PHvxIhKXowE6Q96qsTMq52MkRmziYh+phaYDYkIiEQxq6sWzwuR+gA7/bsyjSnV1W3AMwrjEMmFGpmX7a0Lat4//GClzKR6KTGmNFNJBavlVOzc8Ell0VTRsvUMW4ym7CtsllzYse5Kb24G8lc9mL6x3G8bFgSPu2nRyl4a+6FuByg/qhsF9ioU85xEjIoiMOhsZMiJamzb5fmggkN/uKf4/ips7JHQATf5o9ybAP1KrPFTuWx4V2PQSE+X8yMVRitPeYBRp7ZlZtUL3nXpC2yR1KQS/YAtJ78GCemnyZatVHIabVcxOi9M5qMon2bFg6vTgucBknRJQirlKfGidBFmfkU0tdS+p9YEXqd4WP71smRPIYbrPRGGZQ86Tz1EyOF9reh9XTy2ERpvKTgaByePq1ZT8NiyPYjkNaP4geaScWiN3+aSvGe6kC9UW/wiuq7r455pnCUGY5N8wTupWApeg==|920 \ No newline at end of file +}//I4rGP0S8mvCRAr50ZPGaHD687WYojUVW+Q3dknGj8xipMKg+REZibmaRdhqtF3UshYF2PJOhhli7unmwNpcRkchuVVtyQvvLdyBdolcjYzqyvEW7xjN7owDdc/74o8ZZgux6Q4mDWnS3+J0ctYZMQlY67y7FW5o02W9lKQTPrH+DlR1pJ9wOFdR8hvaM6m091AqInXSVd5Nc95bx+znmQ2kXh8YCY739VZWVkRUHnO53nOKX12D2Zjvgsb2Ijrp6pn/FAVaM7hN87y/yNEjDN3I9XptGrgRmlHDu6CqNyOI8GTvuJL4Rx+JB+uRhF0xf6DDtTNYLY7JtyHCkH9VjtoX3c2F/V/AH21drvRW/0eEr9NGVL5OBzVtJUepQylLhQT9DE0XO6JHr7+vdoOhHs7xrhKyp1PnYk0MGAbLtiAgRGrYStsrv/lHgLNeRnSI3klmfk5mhx3qzgtuZIGv4HW6uxJ6s3CAUHs1iHIR8eVXHCnKCEOug8/HDWFBPJo97OjTbkoDJcmf4jHI1VqJjev+Jme8EK7Vie52p8yacV4ItxDl6wxJVpYJt1n4KSqnrXXtT+qTe/igAtSld4dkHCCvI6HvN1VGT2hTjUKmueDo7asGLMnN807m8k1JzWIckRZlGxGcK30ntC9Hrjutk8mVagecm71mA02Z8Vd06QumZum+YozoQlV/zDKtZIB0+DyegrmdHxqTsEkENueNajQsqSgOSiLju34OBjjFoo8q3AovV3ogFBEhUr6Pk0Cc+NdAjvNL7UljEgaEH9ZOfQQiRvs8s4M0ZPQmtfLnlUDVZkYq89Kqb/EHPoRL6+I5i114jxL4FYSjsnuBdUcEMCv3EDKB0ConakjO8Nzhszc4lNDOJvEk7tYEOvr1jarfdpboM4lBbogiqHLuZDE50wQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页.rd b/Pages/项目/项目首页/项目首页.rd similarity index 100% rename from Pages/项目首页/项目首页.rd rename to Pages/项目/项目首页/项目首页.rd diff --git a/Pages/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json similarity index 100% rename from Pages/项目首页/预算申请/预算申请.json rename to Pages/项目/项目首页/预算申请/预算申请.json diff --git a/Pages/项目首页/预算申请/预算申请.rd b/Pages/项目/项目首页/预算申请/预算申请.rd similarity index 100% rename from Pages/项目首页/预算申请/预算申请.rd rename to Pages/项目/项目首页/预算申请/预算申请.rd diff --git a/Pages/项目首页/预算申请/预算申请审批.json b/Pages/项目/项目首页/预算申请/预算申请审批.json similarity index 100% rename from Pages/项目首页/预算申请/预算申请审批.json rename to Pages/项目/项目首页/预算申请/预算申请审批.json diff --git a/Pages/项目首页/预算申请/预算申请审批.rd b/Pages/项目/项目首页/预算申请/预算申请审批.rd similarity index 100% rename from Pages/项目首页/预算申请/预算申请审批.rd rename to Pages/项目/项目首页/预算申请/预算申请审批.rd diff --git a/Pages/项目首页/项目首页子页面/项目成员.json b/Pages/项目首页/项目首页子页面/项目成员.json deleted file mode 100644 index 0e138f21..00000000 --- a/Pages/项目首页/项目首页子页面/项目成员.json +++ /dev/null @@ -1,720 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 642.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true - } - } - }, - "InLogicalVisibleIndexes": [ - 5 - ], - "Count": 6, - "DefaultSize": 24.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - } - }, - "Count": 40, - "DefaultSize": 32.0 - }, - "Values": { - "1,26": "任务详细视图", - "1,35": "查询" - }, - "AttachInfos": { - "1,1": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "af5f9c93-4159-42bb-89f1-4f5ba75e361b" - }, - "ColumnName": "value" - }, - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "16a5f8b7-9cc4-42cf-8e38-2056e5657781" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择成员", - "noDataText": "无数据", - "multiple": true, - "collapseTags": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, - "1,11": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "Items": [ - { - "Value": "", - "DisplayValue": "所有" - }, - { - "Value": "计划", - "DisplayValue": "计划工时" - }, - { - "Value": "实际", - "DisplayValue": "实际工时" - } - ] - }, - "RulesGuidList": [ - "f7355555-9eb3-43e8-8fde-5cecffe691be" - ] - }, - "1,26": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "CellDefaultValue": "任务详细视图", - "Items": [ - { - "Value": "任务详细视图", - "DisplayValue": "任务详细视图" - }, - { - "Value": "人员统计视图", - "DisplayValue": "人员统计视图" - } - ] - } - }, - "1,35": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "查询", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/047_search_8.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "3,1": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "6899a8cead694b3ba00307b6756dbd7", - "Command": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!B2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!执行人" - } - } - ] - } - ], - "ParamProperties": { - "执行人": "执行人", - "总工时": "总工时", - "平均时薪": "平均时薪", - "总提成": "总提成" - } - }, - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务工时表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "97421878-8c3f-4e42-9ba8-7637d317a933" - }, - "ColumnName": "执行人" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "ff3a5ee6-cb60-4bf0-b312-d3a72c68fb40", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "执行人姓名" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "551e6832-5c1a-4028-a9fa-5f4c72f32d44" - }, - "ColumnName": "总工时" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "平均时薪", - "GUID": "ed933549-a5c9-4e1b-be65-8bcc2b1b35da" - }, - "ColumnName": "平均时薪" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总提成", - "GUID": "05ad4c59-a92a-4d57-8113-0488921b56a6" - }, - "ColumnName": "总提成" - } - ], - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "f93371a2-2e00-42a2-9cef-134287c59879" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格1", - "TemplateKey": "BlackWhite", - "DetailTableSetting": { - "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", - "ColumnOfDetailTable": "项目ID", - "MasterTable": "项目表", - "ColumnOfMasterTable": "ID", - "DataCommitType": 2 - } - } - }, - "3,11": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目成员表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "5e6ecc70-0b8c-48c2-ae52-b26c7f580397" - }, - "ColumnName": "项目成员" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "eded767c-dd09-4323-a133-72d59d357da6", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "项目成员_全名" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "2b7f920d-dae0-4573-8cdd-9595f6750ef5", - "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "岗位名称" - } - }, - "ColumnName": "岗位名称" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "15b189a0-94c5-49c8-a051-80060a288837" - }, - "ColumnName": "默认时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "88127190-fc5f-4ae1-8278-2114953e59bb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!项目ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "FGC_CreateDate", - "GUID": "0b2d493b-818f-4d46-b6b1-b93a3eb7b4d1" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格2", - "DisplayMode": 2, - "TemplateKey": "渐变卡片" - } - }, - "5,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时核定方式", - "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb" - } - } - }, - "StyleDatas": { - "Styles": [ - { - "FontSize": 13.333333333333332, - "Foreground": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, - { - "FontSize": 13.333333333333332 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 2 - }, - { - "FontFamily": 1 - }, - { - "HorizontalAlignment": 3 - } - ], - "Types": { - "Strs": [ - "black", - "Body", - "Right", - "Center" - ] - }, - "CellStyles": { - "1,1": 0, - "1,11": 1, - "1,25": 2, - "1,26": 3, - "1,27": 4, - "1,28": 4, - "1,29": 4, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,35": 2, - "3,1": 5, - "3,11": 5, - "4,1": 5, - "4,2": 5, - "4,3": 5, - "4,4": 5, - "4,5": 5, - "4,6": 5, - "4,7": 5, - "4,8": 5, - "4,9": 5, - "5,1": 2 - }, - "SheetStyle": { - "FontFamily": 1 - } - }, - "Spans": [ - "1,1,1,9", - "3,1,1,9", - "1,11,1,8", - "1,35,1,4", - "1,26,1,8", - "5,1,1,4", - "3,11,1,28" - ], - "PageInfo": { - "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "PageLoadedCommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!项目子页面" - }, - "Title": "加载中" - } - ], - "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": [], - "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目成员!$AA$2=\"任务详细视图\",0,1)" - }, - "GUID": "f7355555-9eb3-43e8-8fde-5cecffe691be", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsInvisible": true - } - ] - } - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - }, - "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目成员!$B$6" - } - ] -}///4AEQp7JwohyriN94PsUJvKaiUz2+J0CNY4CbFBkoipsuHOCW95vcBMKSGyVqP+Ciw3VJRV3enLPe4OH9JCpgicrEVkzzF31FYJlM0hgBmzFjXqykEDDjaiSxhgR7Bv+X01UTx6zVzjSm3cvs1cwgjSN56u7UvOKo3KZz/Z/oh0OurC1rAOszpvaLaxOeWrSeWwwT+Cf4t+iEhpPPQaRaIU3NAEtlA5JiW16tKpwRBo3AcFkIgPwBPXAp+QYIa1UQd7Q26rcXYSUICUY1XFp+BL3xlLneh90d+paEIHK0vXh25NX4piZ0bNYNnnCRiEUKsap+OFdIDjlYvupClklCJSMC8fh3fjP/q0IUpJREIo85AjGKlHiCOGlrtcEPnoPoxagXTogwU58FK+2gZrsc4wPxG9Tb7GIsLHh3H4uEAkCVsk0mEtfj0OF9ocGXudaUUfjGx/IqnQ1PgJlHa30d9Be9QPmpdxbmW4xewrUrKpq5zvM5fb6OW+fvK2kWOk0H64dBIvgbuPl/ggOTMjXjhY3nlZcHt5aRpNTMRStnfQ+SSpk1ciD7NNL1E6CAcHqwpxj7GNdEeBu0CUkrk0b5xDrn+FJn4NNkBV7CidCFpe8KrQfVmdR7Owglm4Bh5x/3l3cSGpbXf700+Htb0ahvBhJ+TrNIj04DJ5yMrz9O989Cqcy7HQZxZv4Oyh5yn36EYM8h5uCHw3zkSzLg8kqmrcDQA0/NnRMfSetjzQzqlvllEAbHGZOaIHgUyW+EiS4sEmBHJ1pDxcU4UrlICfou6V5f/BHPDYnvG+e8qBG2xix3EcgDmulHyTSos1AVKqo4sNGhEctXOyrCT5Okbk0BjGs71ITVxIey2kf9p7voPrWQnZy6/napi/erBOH1j/qO7z2h0fds0vucPe7guZyjw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员.rd b/Pages/项目首页/项目首页子页面/项目成员.rd deleted file mode 100644 index 35e45c39..00000000 --- a/Pages/项目首页/项目首页子页面/项目成员.rd +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 40, - "RowCount": 6, - "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目成员!$B$6" - } - ] -} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd b/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd deleted file mode 100644 index 02dcfb01..00000000 --- a/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 47, - "RowCount": 5, - "Formulas": { - "1,19": "INT(V5/X5*100)", - "1,9": "INT(L5/N5*100)", - "1,29": "INT(AF5/AH5*100)", - "1,39": "INT(AP5/AR5*100)" - } -} \ No newline at end of file diff --git a/Plugin/用户管理命令 V2-10_0_0_0.zip b/Plugin/用户管理命令 V2-10_0_0_0.zip new file mode 100644 index 0000000000000000000000000000000000000000..b5bcf35bbb8230b6f73887e786fb06300d07706b GIT binary patch literal 93337 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 m51M{6devXUn*Wc-PHKv0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" + "ParameterName": "任务信息", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" + }, + "ColumnName": "任务名称" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a" + }, + "ColumnName": "任务预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" + }, + "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", + "RelationBinding": { + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" + } + }, + "ColumnName": "任务状态文本" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算工时" + } + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "31040160-fc88-459c-b67b-8621acbc0920", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算费用" + } + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "17b7e0ce-f6c5-4095-93e6-637aa62440a7", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时核定方式" + } + }, + "ColumnName": "工时核定方式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", + "RelationBinding": { + "RelatedTable": "任务类型", + "RelatedColumn": "ID", + "DisplayColumn": "提成系数" + } + }, + "ColumnName": "提成系数" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总实际工时", + "GUID": "8505a216-3aee-4056-affe-6c760e35c844" + }, + "ColumnName": "总实际工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "ID": "ce6cf79cab824510adc4dc16a3bcd8e4" - } - ], - "ID": "5e4f37e7-68da-4c37-b158-504dde3310cd" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算时薪", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=指定时薪单价" - }, - "ID": "42acba22a57f436eabba47314ae73ffb" - } - ], - "ID": "ad856a50-2718-4e43-9e32-74739c0de1e6" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务状态" - } + "ID": "fd009643b2374e2fbc54775cf4ebe137" }, - "value": "1" - }, - "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -360,7 +358,60 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.严格模式" + "SerializeProperty": "=指定时薪单价" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" + }, + "ID": "03fde63189d94667ae6d5c6a1979a5bb" + } + ], + "ID": "1be0fa3d-4226-478b-9916-63423673dea2" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=指定时薪单价" + }, + "ID": "6fc649ddfae843caa1f555278ace195d" + } + ], + "ID": "ae194b64-06f0-4113-8c61-89b159094f8a" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预测本次产生成本", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" + }, + "ID": "1663c0564426454cb4d8f6337bec5d02" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务状态" } }, "value": "1" @@ -376,65 +427,12 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" + "SerializeProperty": "=任务信息.严格模式" } }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } + "value": "1" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总统计工时", - "TableValue": { - "TableName": "任务工时表", - "OnlyGetValue": true, - "TableValueType": 0, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "0e13d951-a44b-40e4-8ab7-50409bfa7785" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "ID", - "GUID": "574064e4-3b8f-49d2-a025-1f94902658b5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "57c95084-14b9-46ba-86f0-c80a7b6a1126" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } - } - ] - } - }, - "ID": "fecda59716454e74ae70599e1629520a", - "Comments": "检查工时是否超支" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -445,464 +443,291 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总统计工时+工时数" + "SerializeProperty": "=工时类型" } }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算工时" - }, - "compareType": 2 + "SerializeProperty": "=任务信息.工时核定方式" + } }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&任务信息.项目预算工时&\"h)，请修改后提交！\"" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计信息", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" + }, + "ColumnName": "总成本" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "45110ee2-aa57-4a49-bea6-a94586f164ba" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "a4773f83-2817-4be0-9e7d-4b5b3cd36ed5" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "9a972b19262c4b819a666d6c442c6d6b", + "Comments": "从视图统计项目的信息" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.总核定工时+工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.项目预算工时" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&项目统计信息.项目预算工时&\"h)，请修改后提交！\"" + } + } + ], + "Comments": "如果加上本次提交的工时>预算的工时，则拦截", + "ID": "18583b21-d2a0-428e-996a-3cfc62fd4887" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预测本次产生成本" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.项目预算费用" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "预算超过项目限制，请申请预算后再尝试提交！" + } + ], + "Comments": "先算出本次提交产生的成本，如果>预算的费用，则拦截", + "ID": "d4cd3b02-8a6f-41dc-bf86-9773da9f0fb4" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务统计信息", + "TableValue": { + "TableName": "View_任务工时统计", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "30e9fee2-cc98-4ce8-954a-4694deb3225d" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "4ef81414-5f02-4242-a14a-3c0762e72e33" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + }, + "ID": "9d97ee1dd7d0410b9602c3373d41759c" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务统计信息.总核定工时+工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "此次报工超过任务工时限制，请修改后提交！" + } + ], + "Comments": "如果任务当前工时+本次报工工时大于预算，则拦截", + "ID": "c3edd061-47b0-48f1-924e-f0b3a7250f6a" + } + ] + } + ], + "Comments": "如果上面两条项目都没超标，就检查是否设置了任务预算工时。", + "ID": "b3bfc6b0-689a-45a4-99ca-7b07d8b03653" + } + ] } ], - "ID": "280489d7-50c5-4b70-ae88-430315e96eca" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计划消耗列表", - "TableValue": { - "TableName": "任务工时表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "43c04868-12c7-4e9d-b126-070d0e426dc6", - "RelationBinding": { - "RelatedTable": "任务成员表", - "RelatedColumn": "ID", - "DisplayColumn": "参与人" - } - }, - "ColumnName": "参与人" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "2a0d738b-1e15-4fc1-835f-1a191e17f002", - "RelationBinding": { - "RelatedTable": "任务成员表", - "RelatedColumn": "ID", - "DisplayColumn": "任务时薪" - } - }, - "ColumnName": "任务时薪" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "366dc09c-6a7e-4c9c-9bae-48e1d9eab780" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "ID", - "GUID": "f9e17555-63a1-4c0f-8b80-06b4297cbbb5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "9512823f-431d-4f44-9cab-ba2d773d3a44" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "bae0ed2a25ca4484be3ddf991fcda719", - "Comments": "检查预算是否超支" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总消耗金额", - "ParameterValue": "0", - "ID": "04a622af684046f7adf496cc660cde6f" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计划消耗列表" - }, - "LoopItemParamName": "Item" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总消耗金额", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" - }, - "ID": "cde704fd082f4796baeda7390f2f1be0" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总消耗金额" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算费用" - }, - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"计划工时总预算超过项目预算金额(\"&任务信息.项目预算费用&\"元)，请修改后提交！\"" - } - } - ], - "ID": "4d8bf5b9-6b77-49d6-b683-e8f5a8f415da" + "Comments": "如果提交的工时类型等于项目工时的核定方式", + "ID": "5c34c921-a5f1-434e-a589-050799038608" } ] } ], - "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "6cc0e897-9692-457d-9628-93bbe7890afc" + "Comments": "严格模式下，需要校验工时和费用是否超标", + "ID": "dae3bbb7-7b4e-48d3-8b08-fecf28a357c1" } ] - } - ], - "ID": "14cdf349-de7b-49de-9e4f-0bec56189e2d" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "待分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - }, - "ID": "c47706cfdef74a61943d8b52147e01e3" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "分配天数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" - }, - "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4" - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配天数" }, - "LoopIndexParamName": "index", - "LoopItemParamName": "Item" - }, - "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前日期", + "ParameterName": "待分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期+(index-1)" + "SerializeProperty": "=工时数" }, - "ID": "6e7b4d4141a24bac944dedf38ee89b94" + "ID": "9fa5a1b21c574f1a8b59a42611442fd7" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "统计工时", - "TableValue": { - "TableName": "任务工时表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "a0006a9d-3fba-4cf5-a20a-d2a0909d5175" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "98f3f236-67bc-4db2-9af7-407e52bdcd74" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "9a1d5408-9353-4ab0-bef4-91af355df584" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 + "ParameterName": "分配天数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "2292424aae1d4f5591ddd78ce5ac22ab" + "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4" }, { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=index" - } - }, - "value": { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=分配天数" }, - "compareType": 4 + "LoopIndexParamName": "index", + "LoopItemParamName": "Item" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", + "ParameterName": "当前日期", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" + "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "44b51db4c6be470dbc468d4a9abfa061" - } - ], - "ID": "d3def141-eff7-41db-9f93-544d9b935b2a" - }, - { - "CommandList": [ + "ID": "579061b5cf414774a2af1aaa9c04b29b" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时,1)" - }, - "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" - } - ], - "ID": "f77ff10b-6ba5-4900-b43a-3d022ebf6b35" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - "value": "计划" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "执行人负荷", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" - }, - "ID": "03f94c6a676740b799eddd0aafce2fe5" - } - ], - "ID": "8470a624-72fe-42e2-9c23-508d5dbce61f" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - "value": "实际" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "执行人负荷", - "ParameterValue": "24", - "ID": "f998993f4e8f4778a448ca19dc771a2b" - } - ], - "ID": "3ea6a35e-aca0-4da0-96a2-827961614cda" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预计增加后工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" - }, - "ID": "36354abf29e44a4e9790b6db43c12fa9" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预计增加后工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人负荷" - }, - "compareType": 5 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "待分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" - }, - "ID": "8e34730a7bb547b880d26b1e4d60fc06" - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "8266eb64-4b8a-4afd-9759-13f1f82196ce" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } + "ParameterName": "统计工时", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "a0006a9d-3fba-4cf5-a20a-d2a0909d5175" }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "ee34836d-306f-42a0-bde4-0a2bc7694a53" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "a67924a7-4ca8-4222-9e98-ca876183acd0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "ff819755-816a-43ad-aead-2d444ab8aa54" + "GUID": "98f3f236-67bc-4db2-9af7-407e52bdcd74" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -910,155 +735,380 @@ } }, { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "9a1d5408-9353-4ab0-bef4-91af355df584" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "f00ff5d6-4fcc-4e2c-88e7-f819d60b9cdb" + "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时类型" } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "01ab262b-fbde-4b83-821e-2f15525cca71" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员.参与人" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "056d35e2-7717-4c08-8d4e-e490f094a187" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "b05891a8-766c-4818-9a2e-25c84c0b091e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "249e9008-82d0-488e-81b0-bf68cf697e06" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "提成系数", - "GUID": "977fd2b4-c778-44f7-911f-ee60bbcd4f45" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" - } } ] }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "fbb132d33b854e1aaf0d772bc3a8dbef" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "1dce04a1-51d2-410b-9115-53e1589784cb" - }, - "Value": { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" + "SerializeProperty": "=index" } }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "21b4a9e2-8067-4aec-9dc9-8fcbfa5eef37" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" - } + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配天数" }, + "compareType": 4 + }, + "CommandList": [ { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "786a9666-0199-4ef9-a809-a706cc48c49a" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "Value": "%CurrentUser%" + "ID": "44b51db4c6be470dbc468d4a9abfa061" } - ] + ], + "ID": "6bdf772f-22a4-4f5b-b055-9f6536541fd0" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配工时,1)" + }, + "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" + } + ], + "ID": "69e6f7b6-a80f-4d1e-907c-e6a189bd95f7" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + "value": "计划" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行人负荷", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" + }, + "ID": "03f94c6a676740b799eddd0aafce2fe5" + } + ], + "ID": "cd001833-22d4-4525-bcf3-0692f8a4164f" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + "value": "实际" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行人负荷", + "ParameterValue": "24", + "ID": "f998993f4e8f4778a448ca19dc771a2b" + } + ], + "ID": "2c656595-72a8-4019-b45a-26b2f75d103c" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预计增加后工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" + }, + "ID": "36354abf29e44a4e9790b6db43c12fa9" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预计增加后工时" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人负荷" + }, + "compareType": 5 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "待分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" + }, + "ID": "8e34730a7bb547b880d26b1e4d60fc06" + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "48030a9d-d571-48e1-ba20-5a07fde2d76d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "f560a7a1-56da-43f4-81ed-4fcbd46e74b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "f75337d0-3045-47db-b89f-91e723bb678b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "5eaa88d9-791e-429d-b63a-a33127b143d6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "c0a03cd6-8949-45ab-b55a-112f8350a866" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "7a34035c-a6c0-4c86-9ee2-ffce0a7ecd21" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "26d2cda5-0221-4f00-bbf3-af07b8a1fa39" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "59ceb364-5bae-44c0-8ad5-c6a86452cb45" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "f8051ee9-3d0a-4ca2-930b-118a5f359c71" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "93679277-9641-47dd-819f-ac3571a21ae5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "8f465c29-ba82-4212-bd94-bfe43ac0fa42" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "a754f2cb-3bfd-439f-99fc-ace8f8510b11" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + } + ], + "ID": "dfad8684-4662-48c9-a44b-d8c82d1ce252" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制的\"&执行人负荷&\"小时，请重新提交！\"" + } + } + ], + "ID": "f238fec4-27aa-4f24-b2b6-3096a1e12d58" } ] } - ], - "ID": "e65c0886-121e-4277-9459-a00b33d9ab8f" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制的\"&执行人负荷&\"小时，请重新提交！\"" - } - } - ], - "ID": "048b4b2c-8173-4467-ad18-5dce727bf6c9" + ] } ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "提交工时成功" } - ] + ], + "ID": "70d852be-8d93-43a3-a7b5-edcab6981caf" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务状态为[\"&任务信息.任务状态文本&\"]，无法提交工时！\"" + } + } + ], + "ID": "01558a83-dd2d-4cfe-90af-5bf8d94845be" } ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "提交工时成功" } ], - "ID": "35a1fea2-2a6d-4ee5-b820-0f4a72042b94" + "ID": "82029e6a-99c0-49a5-9646-0fc534133b8b" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"当前任务状态为[\"&任务信息.任务状态文本&\"]，无法提交工时！\"" - } + "Message": "成员不在任务内，无法报工！" } ], - "ID": "69b99b00-b9f6-48e1-b362-1376f6b0c7d2" + "ID": "58aede58-95c2-47ac-a465-d08f0a32da5c" } ] } diff --git a/ServerCommands/用户/更新用户配置.json b/ServerCommands/用户/更新用户配置.json new file mode 100644 index 00000000..f4206732 --- /dev/null +++ b/ServerCommands/用户/更新用户配置.json @@ -0,0 +1,145 @@ +{ + "Name": "更新用户配置", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "负荷", + "DataValidationInfo": {} + }, + { + "Name": "默认时薪", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "62e678a5-f9ee-410d-bd98-e5a95556d6ed" + }, + "ColumnName": "邮件" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "2226f68b-3c3c-4d6c-a5eb-aac00b02c951" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e7c9e67f-4354-448f-a5b8-0df81d27d6be" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "TopCount": "1" + }, + "ID": "4d7d73e4d30f4a8eb1017158c0e2adac" + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户.邮件" + }, + "ExtendedProperties": [ + { + "Name": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=负荷" + } + }, + { + "Name": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=默认时薪" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "保存成功" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/项目/同步项目成员.json b/ServerCommands/项目/同步项目成员.json index dcc4b578..be8a1f0a 100644 --- a/ServerCommands/项目/同步项目成员.json +++ b/ServerCommands/项目/同步项目成员.json @@ -84,7 +84,7 @@ } } }, - "ID": "26c5cca1321e4452a0571822eda70f9d" + "ID": "5a0ad3f6027f47d6b62484d516aa2e03" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -205,11 +205,12 @@ ] } ], - "ID": "747cdcdd-8f33-49f2-bac1-c05fc36b2602" + "ID": "afcc2411-1b9d-4211-9b98-d668eb09da45" } ] } - ] + ], + "Comments": "查找任务成员表里的成员" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -247,7 +248,8 @@ } } }, - "ID": "b61a6630f13f4d60a260243f7ba8d01e" + "ID": "e06003e76e034598b3a4059476852ba3", + "Disabled": true }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -340,11 +342,13 @@ } } ], - "ID": "472d8e9e-a7a8-4def-bdbd-c74cb220ddd4" + "ID": "09ec1c75-f0a0-4ffa-a4b0-a5049f63561c" } ] } - ] + ], + "Comments": "将多余的项目成员剔除", + "Disabled": true }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", diff --git a/ServerCommands/项目/移除项目成员.json b/ServerCommands/项目/移除项目成员.json new file mode 100644 index 00000000..d0d6bb43 --- /dev/null +++ b/ServerCommands/项目/移除项目成员.json @@ -0,0 +1,215 @@ +{ + "Name": "移除项目成员", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "成员用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否参与任务", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "cb481729-447b-4d73-9329-6985ed0428e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "51726e62-6255-4e23-9bb4-498d1b063d3f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "463af416-af9e-43ba-91cd-5b3f7771b538", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "执行者" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 + } + ] + } + }, + "ID": "2cffba6c6bea4272bc627c5f7455e410" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否参与任务" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "442c8862-a026-4267-9d73-bce2152a982d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "fb204421-bf1a-4021-9b8b-1237c01a1fa7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "1136590a-6f78-4586-8611-9c3a0ee7b2a2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "54034bbd-5b74-4ea9-9411-1b4646b2b513" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"将成员\"&成员用户名&\"从项目里移出\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "60fa8f7a-e378-431e-b287-01e5b8f9a1bf" + }, + "Value": "%CurrentUser%" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "删除成功" + } + ], + "ID": "c893eeab-d955-4c20-9127-4a65b34bdfda" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "该成员已参与到具体任务，请先从任务中剔除后再进行删除！" + } + ], + "ID": "0cfa5973-d6d6-4c62-9e7f-b6d92248dd52" + } + ] + } + ] +} \ No newline at end of file diff --git a/Tables/任务/任务成员表.json b/Tables/任务/任务成员表.json index 76a824e8..296270b3 100644 --- a/Tables/任务/任务成员表.json +++ b/Tables/任务/任务成员表.json @@ -11,6 +11,13 @@ "Name": "ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -84,6 +91,13 @@ "ForeignTable": "任务成员表", "ForeignColumn": "岗位ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignTable": "任务成员表", + "ForeignColumn": "项目ID", + "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index bb3b2e25..82d57b1a 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -197,6 +197,19 @@ "Name": "开始报工日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "b5f07f2a-ddac-4747-84cd-bbdef039f1c1" + }, + "AggregateFunction": 5, + "DataColumnName": "参与人", + "DetailTableName": "任务成员表", + "Name": "参与人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index e1e2156b..30805da1 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -43,6 +43,14 @@ "Name": "实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "AggregateFunction": 4, @@ -56,6 +64,18 @@ "DataColumnName": "实际工时", "Name": "总实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "6a8d98f3-25ad-4c5b-9a82-e032d9ae9638" + }, + "AggregateFunction": 4, + "DataColumnName": "核定工时", + "Name": "总核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -63,7 +83,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期],\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时]\r\nFROM \r\n [dbo].[任务工时表]\r\nGROUP BY \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期];", + "CreateViewSql": "SELECT \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期],\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时],\r\n\t(CASE p.[工时核定方式]\r\n\tWHEN '计划' THEN ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\n\tELSE ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\nEND) as 核定工时\r\nFROM \r\n [dbo].[任务工时表] t\r\nLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\nGROUP BY \r\n [项目ID],\r\n\t[工时核定方式],\r\n [任务ID],\r\n [执行人],\r\n [工时日期];", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true, diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index 607b1e53..09adde5b 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -48,16 +48,16 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "成员ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "执行内容", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "执行内容", + "Name": "时薪来源", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -152,13 +152,6 @@ "ForeignTable": "任务工时表", "ForeignColumn": "任务ID", "IsDetailTableRelation": true - }, - { - "PrimaryTable": "任务成员表", - "PrimaryColumn": "ID", - "ForeignTable": "任务工时表", - "ForeignColumn": "成员ID", - "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/项目任务/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json similarity index 84% rename from Tables/项目任务/View_项目统计信息.json rename to Tables/项目/View_项目统计信息.json index a4c4e48f..fa59d943 100644 --- a/Tables/项目任务/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -130,6 +130,30 @@ "Formula": "[总核定工时]&\"/\"&[项目预算工时]", "Name": "工时成本情况", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([已完成任务数]=0,0,INT([已完成任务数]/[总任务数量]*100))", + "Name": "任务完成比例", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总核定工时]=0,0,INT([总核定工时]/[项目预算工时]*100))", + "Name": "工时消耗比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总成本]=0,0,INT([总成本]/[项目预算费用]*100))", + "Name": "预算消耗比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[总计划工时]*100))", + "Name": "计划工时使用比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -146,6 +170,14 @@ ] } }, - "Relations": [], + "Relations": [ + { + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignTable": "View_项目统计信息", + "ForeignColumn": "项目ID", + "IsDetailTableRelation": false + } + ], "Indexes": [] } \ No newline at end of file diff --git a/Tables/项目任务/项目任务分组.json b/Tables/项目/项目任务分组.json similarity index 100% rename from Tables/项目任务/项目任务分组.json rename to Tables/项目/项目任务分组.json diff --git a/Tables/项目任务/项目分组.json b/Tables/项目/项目分组.json similarity index 100% rename from Tables/项目任务/项目分组.json rename to Tables/项目/项目分组.json diff --git a/Tables/项目任务/项目动态.json b/Tables/项目/项目动态.json similarity index 100% rename from Tables/项目任务/项目动态.json rename to Tables/项目/项目动态.json diff --git a/Tables/项目任务/项目岗位.json b/Tables/项目/项目岗位.json similarity index 84% rename from Tables/项目任务/项目岗位.json rename to Tables/项目/项目岗位.json index 149f71be..06b39228 100644 --- a/Tables/项目任务/项目岗位.json +++ b/Tables/项目/项目岗位.json @@ -32,6 +32,19 @@ "Name": "默认时薪", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "026a2026-8276-4057-8852-c76f4ac0a1e8" + }, + "AggregateFunction": 1, + "DataColumnName": "ID", + "DetailTableName": "项目成员表", + "Name": "成员数量", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/Tables/项目任务/项目成员表.json b/Tables/项目/项目成员表.json similarity index 100% rename from Tables/项目任务/项目成员表.json rename to Tables/项目/项目成员表.json diff --git a/Tables/项目任务/项目版本.json b/Tables/项目/项目版本.json similarity index 100% rename from Tables/项目任务/项目版本.json rename to Tables/项目/项目版本.json diff --git a/Tables/项目任务/项目表.json b/Tables/项目/项目表.json similarity index 92% rename from Tables/项目任务/项目表.json rename to Tables/项目/项目表.json index 6d836e99..c2539420 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目/项目表.json @@ -179,7 +179,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -189,7 +191,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -226,7 +230,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -236,7 +242,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -273,7 +281,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -283,7 +293,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -460,6 +472,32 @@ "Name": "删除", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "04a57004-15e7-4437-beae-2abfa17d2d60" + }, + "AggregateFunction": 5, + "DataColumnName": "项目成员", + "DetailTableName": "项目成员表", + "Name": "项目成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "d7436014-d17a-4780-82ce-bbfe46a7a23b" + }, + "AggregateFunction": 5, + "DataColumnName": "参与人", + "DetailTableName": "任务成员表", + "Name": "参与人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/Tables/项目任务/项目预算变动表.json b/Tables/项目/项目预算变动表.json similarity index 100% rename from Tables/项目任务/项目预算变动表.json rename to Tables/项目/项目预算变动表.json