diff --git a/.collaboration b/.collaboration
index a4109515..ed69c6c5 100644
--- a/.collaboration
+++ b/.collaboration
@@ -152,16 +152,7 @@
},
{
"ModuleName": "Table/任务工时表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:22:20.7452525+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\工时\\任务工时表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Tables/流程表文件夹",
@@ -287,42 +278,15 @@
},
{
"ModuleName": "Table/收益变动记录表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:38:13.0491491+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\收益\\收益变动记录表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/收款账户信息表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:06:12.233137+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\收益\\收款账户信息表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/收益请款单表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:37:28.303755+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\收益\\收益请款单表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/请款单状态",
@@ -338,16 +302,7 @@
},
{
"ModuleName": "Table/付款凭证表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:21:40.619104+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\财务\\付款凭证表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Tables/AI助手",
@@ -563,21 +518,7 @@
},
{
"ModuleName": "PCPage/项目列表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:19:38.2018867+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目列表.json",
- "Pages\\项目\\项目列表.rd",
- "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json",
- "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd",
- "Pages\\b90932e038f94707b54e571ff7cd84d.json",
- "Pages\\b90932e038f94707b54e571ff7cd84d.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目成员详情",
@@ -601,31 +542,11 @@
},
{
"ModuleName": "PCPage/项目首页",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T11:13:20.3032249+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页.json",
- "Pages\\项目\\项目首页\\项目首页.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:11:36.7833532+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目标题.json",
- "Pages\\项目\\项目首页\\项目标题.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目/项目首页/项目首页-容器页面",
@@ -701,17 +622,7 @@
},
{
"ModuleName": "PCPage/项目信息",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:47:41.8472091+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目配置\\项目信息.json",
- "Pages\\项目\\项目首页\\项目配置\\项目信息.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目岗位配置",
@@ -783,19 +694,7 @@
},
{
"ModuleName": "PCPage/任务-子任务列表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:10:21.0184509+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-子任务列表.json",
- "Pages\\任务\\任务-子任务列表.rd",
- "Pages\\558ca610fafc4ffd8884b819161bfd6.json",
- "Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-工时",
@@ -811,19 +710,7 @@
},
{
"ModuleName": "PCPage/工时详情",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:52:15.6275274+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\工时详情.json",
- "Pages\\任务\\工时详情.rd",
- "Pages\\31a709cea02e45ad83bb92336a6d829.json",
- "Pages\\31a709cea02e45ad83bb92336a6d829.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/新增任务",
@@ -855,17 +742,7 @@
},
{
"ModuleName": "PCPage/修改报工",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T11:14:40.653344+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\工时\\修改报工.json",
- "Pages\\任务\\工时\\修改报工.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/新增报工",
@@ -1005,19 +882,7 @@
},
{
"ModuleName": "PCPage/个人中心-收款账户",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:05:57.5676075+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\个人中心\\个人中心-收款账户.json",
- "Pages\\个人中心\\个人中心-收款账户.rd",
- "Pages\\9194032cc73440d49d0193bce31608b.json",
- "Pages\\9194032cc73440d49d0193bce31608b.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/账户信息",
@@ -1029,101 +894,27 @@
},
{
"ModuleName": "PCPage/收益中心",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:27:38.8084678+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\收益中心.json",
- "Pages\\收益\\收益中心.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/收益中心-收益请款记录",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:28:10.4091437+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\收益中心-收益请款记录.json",
- "Pages\\收益\\收益中心-收益请款记录.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/收益中心-变动记录",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:28:18.3182407+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\收益中心-变动记录.json",
- "Pages\\收益\\收益中心-变动记录.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/收益中心-收益明细",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:55:12.7124495+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\收益中心-收益明细.json",
- "Pages\\收益\\收益中心-收益明细.rd"
- ]
- },
- {
- "ModuleName": "PCPage/提交结算申请单",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T12:43:47.9271811+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\提交结算申请单.json",
- "Pages\\收益\\提交结算申请单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/审批结算申请单",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:45:20.2309882+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\审批结算申请单.json",
- "Pages\\收益\\审批结算申请单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/办理结算审批单",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:56:08.9774178+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\办理结算审批单.json",
- "Pages\\收益\\办理结算审批单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/首页",
@@ -1223,16 +1014,7 @@
},
{
"ModuleName": "ServerCommand/分配任务工时",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T10:15:52.3107757+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\工时\\分配任务工时.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommands/项目",
@@ -1294,45 +1076,6 @@
"ModuleName": "ServerCommand/修改请款单状态",
"ModuleType": 15
},
- {
- "ModuleName": "ServerCommand/绑定工时与请款单",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:26:38.413723+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\收益\\绑定工时与请款单.json"
- ]
- },
- {
- "ModuleName": "ServerCommand/绑定结算请款单凭证ID",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:23:48.1940961+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\收益\\绑定结算请款单凭证ID.json"
- ]
- },
- {
- "ModuleName": "ServerCommand/记录收益变动",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:26:23.0425197+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\收益\\记录收益变动.json"
- ]
- },
{
"ModuleName": "ServerCommands/汇报",
"ModuleType": 20
@@ -1391,17 +1134,7 @@
},
{
"ModuleName": "ProcessItem/结算申请",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:27:00.6805733+08:00",
- "ModuleType": 28,
- "ToRemoveFiles": [
- "Process\\结算申请.json",
- "Process\\结算申请.bpmn"
- ]
+ "ModuleType": 28
},
{
"ModuleName": "Notification/AI流消息",
@@ -1741,19 +1474,7 @@
},
{
"ModuleName": "CustomLibrary",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:12:52.5848256+08:00",
- "ModuleType": 12,
- "ToRemoveFiles": [
- "CustomLibraries.json",
- "UserFile\\BaseCss.css",
- "UserFile\\CustomFormula.js",
- "UserFile\\echart.js"
- ]
+ "ModuleType": 12
},
{
"ModuleName": "MapJsonFile",
@@ -2193,16 +1914,7 @@
},
{
"ModuleName": "TableView/项目平行视图",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:49:42.0721699+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\项目\\项目平行视图.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "Pages/任务/任务成员",
@@ -2430,52 +2142,22 @@
},
{
"ModuleName": "Image/返回.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T09:18:33.2647142+08:00",
"ModuleType": 38
},
{
"ModuleName": "ServerCommand/删除请款单",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T12:43:28.6901355+08:00",
"ModuleType": 15
},
{
"ModuleName": "PCPage/生成结算申请单",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T12:43:47.9271991+08:00",
"ModuleType": 1
},
{
"ModuleName": "ServerCommand/完成请款单",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:27:00.6805671+08:00",
"ModuleType": 15
},
{
"ModuleName": "ServerCommand/生成请款单",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-21T13:38:13.900145+08:00",
"ModuleType": 15
}
]
\ No newline at end of file
diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json
index f7e10ecb..9ffb3849 100644
--- a/Pages/31a709cea02e45ad83bb92336a6d829.json
+++ b/Pages/31a709cea02e45ad83bb92336a6d829.json
@@ -224,7 +224,7 @@
}
}
],
- "ID": "cc6414c0-8d71-4e21-8a1f-5bda38e21d69"
+ "ID": "760c7b0c-f2de-4722-9f49-9c5bbf2bba99"
},
{
"CommandList": [
@@ -239,12 +239,12 @@
"BtnText": "知道了"
}
],
- "ID": "c6a8d546-184d-41b1-aec6-aaa597dbf6e9"
+ "ID": "6eea72a2-4e4c-4c71-9b83-3621c7001d00"
}
]
}
],
- "ID": "61fe0214-8f67-4058-844c-3f771b64bc7a"
+ "ID": "0a18ae24-33c5-4139-b7be-ec2c604d7875"
}
]
}
@@ -366,7 +366,7 @@
"value": "编辑"
},
"CommandList": [],
- "ID": "75427578-3fff-4b0d-bf43-be22cfd18e71"
+ "ID": "3ac97d64-3d7c-43b1-abae-45a6d851410d"
},
{
"Condition": {
@@ -420,17 +420,17 @@
}
}
],
- "ID": "9bd33793-772f-4e03-9bbf-40770581cf1b"
+ "ID": "b1e90b4f-7a32-4637-aa81-726175ede3a1"
}
]
}
],
- "ID": "66d71c5c-95db-4fb2-bf5c-6f58014cfeff"
+ "ID": "4c1935fe-f160-48eb-8e84-6020a527dad5"
}
]
}
],
- "ID": "4a099079-1594-4b16-b203-aa37fdaced09"
+ "ID": "9e75e526-9aa4-4d97-bfcd-54cf64b084fa"
}
]
}
@@ -550,4 +550,4 @@
"PaperSize": {},
"Margin": {}
}
-}//58WETGhJJVvEAKtlp2msSB8ewUo/hkWZzBIPJM1dWDR+xf6Gi2ae/RU8Vvq+Pi77qAA216c3Hhl8mnnkbop48fc9Obys8p3JWRzr3qBbKWr6mHn7m/Iz0uB4XR85saB6dY2PB7XIvdZRhpdZ0NRaT3jJ9N3FtuOMFhSvEFWS4re7+LW6lpLIoL3eMS339EREXpq88S/Q2M1Zmeb4umbyIXrtMOEnl82+i9GGd0Sbge+wn1GdI4PtnZl2sSRTo7VSuMyVfb8ygSZQOWf12bLgpjioOsvNJPVWfOFU3z+DfTyJqwKY0SwC053G8fddmIS1RB6ueQbkYADz1oKGm4/fWjgtvVsV+byVpJ7q1e0jvZ7jPou66/KswAROT2QGPbMANEN7sDuXG6Akg0e0T349/eRZNGIlW2MiwTD2R5ORzttubWmiN2WZcFicGRaodps0loFqdUClwzS9Lj6Qrk/MPxVdtKe7Cu8ctWjYNo7Topt3Y4cWKOS3rhCA+96izubNGxPZmybVQQK2Nj9R1YQzZOrvm3EAsH8nyTbDyc4kyK62rWb3X8/XK7K726tlADRRCpHW4B4SmSOoRtESKqSKtARUVLPrFEzAS0CewpqD51Qd40nbw/vJn7jvY2+Fv/I+X97Di/ufeTEHDkgA5a7NubUSTH1Jcfc5cNitbS166Lu4D+16b1IzWXHaYGrb49z1hQISDGMer2ULtTPb/Jt6K/3ylq0VvC4zEU02Yo1p/BaUgHLYm0yF0SQuDRLmUvwYlA18/wqqhLJ1qdDlWlbbKFVPahwMzRdSoayQMVjdWOu739TEmv+VgPzuqYqNSwO3DMFyWxhse1yCituj/YArQ6rZ+KNg3U2HQJOcAsX44BKT2pnZU2bkuDGtuIV2wBhsQi/c/0zrWFTaTO+b84QhEQ==|920
\ No newline at end of file
+}//RbubtWNx+Ni5g7NtqkmMm+r7yjTGe9UnLvpoRE0PZeHFGRZbehRpSKtmIlnMlvf5+v2wjhUkgfijMIO0DL3Re2hIjN6QlrI/5VkkHRmzQPW6lyq1p4747z7sdWfUXEg1QVCv6kEzJwXmqGPxgkMEWHYYIe5np6xHPCXDB2rYyt1SEpL/H8VZ2pcUxm+DbZDz0Iqw28p+ORCCy6eHX6UIckAiUmabxGW/s5Qvc02KcJrqhwOC9KnDu+ysnQHh8iMvo/MdzOIbF/m+AY1Tzdm7fz3Acecu0RFRdWtzqNYzuaxg+yCfR/y5p+sLnJLUahRlwKjdQIuCpgdqbZnuHBGVMbXhDcabCnzkJ0UrlFPh5GHJ5VFpmHVi6w82WwlXAevs0H21JpCJZYG7pIgR5KFcD2HAZh6VVPKSXvif236LDDBmQUIUndm1WPIBomX736NBiRr7Zrcj8Ja0uHTyawGvdmpPUVioCul+d8Qy4tjuvaPi1VYVIqY7mqc7fsmYKiNSFx1DCGU9QlFx/RYFuuRLoHYW90aW3PiVEGxprr6tW4WXtz9SWBmlY6fWpZRwPxHOHS/GAD4aLe/2UVJqWJz33tDYZicoM2owVm/HibOXg8O7QyDYzUw/V3dGgmYk3xxsv5hAOt0KaW4Pb4urDtOclupJEvI2npfGNvzCArR9nHSqZjP20NYE00bMQiSbWFcUGcTjzQ9JFe1hAlvlC+vhrHgPHVNQngZy+selG9bRMpUOughLxTynCHk2DcRM5z9yiYAYUFNZ9j6InQHjqYr/G69f2QJbZ8TAv4mOXf5UPvRL6+Ddlec4oUgt6wHa7jI4dS0baKx5YYxbh4zqWa3NmeAYiPRUOTCPSYRGHZoiW9OM7F5Zke/ukpRO+fMXYzY3ObST7u7RTSJyGw2+NaLNng==|920
\ No newline at end of file
diff --git a/Pages/558ca610fafc4ffd8884b819161bfd6.json b/Pages/558ca610fafc4ffd8884b819161bfd6.json
index 7778fe66..642ece84 100644
--- a/Pages/558ca610fafc4ffd8884b819161bfd6.json
+++ b/Pages/558ca610fafc4ffd8884b819161bfd6.json
@@ -92,7 +92,7 @@
"TemplateCellSource": "开始时间"
},
"1,7": {
- "TemplateCellSource": "执行者"
+ "TemplateCellSource": "执行者_全名"
},
"3,1": {
"TemplateCellSource": "ID"
@@ -153,4 +153,4 @@
"PaperSize": {},
"Margin": {}
}
-}//F5t9pDwN+bd8lBQ7kKuUyhlIWU2sEjsarBKBmRReWBBAYUCHbwZ5hVLI9MJjRXH5+nv9/ACCKOCM2OQYR0AZUlnrtwiTayaeePRnE3tpXwBJ7O4CXAtmruMURoiXsuRJR63icuWaqmlPKJSGlQIgAiDEBUznRow393SPtIQwg5k5xT9MGSyRhYWfkcr5/I8YVdC0bPVv46ihmeUF9z1Dw6LeErjrISdkLczxKSgDjQzMDu46NhUSOcclEB0u+TlKYY+LnX40G3QUGDEJDUBDtRxdM0//usAM5aXMzsN4V5UbPx2pnCf+qk3Ryvh20P9SCm+oeG3QleD2diL1lhvNkSZnLUlQLET8xYLLecCtaEXiHgoYJTTaO7/Z88GSpUzveK+Lx31xqZb8cLRXbEMxF594DdAnOmqmf4gFCDrLEOHsboxA5t8LRvRtzGUJAPMjXfMlpDXKPqZj47t1ckjR1qI5JvZlODPP+Yuq/EbC5uSPMeiZce8y/QaoSqMprt5fTr9UbGAsfIp2eMwykC9ZU+Zy03vWi+49IHIfgDnh9PwKPKNh0NCTaTJgHt1Z1TeXDVMKLWzQi1rQqoxpD4Zy6wcWosSt32A5R6CCl5ILgtlbK3WzqyjMW/b5BxoN8FpVXqJtIK8jhyelzyGqDr+yABbE0S6bGNuVjsBuuFvxxd70UxCXmEfE6MdZOfu08Qp6YvYZjbfMGDPMPJTpqhiAmijf/G1yqVbJMG1i7/VutRVoIpKCVLdzLXjcQhQra9HFWzHpaVbQA24JgOASWLVtpz0A8jANEUtzhH0UIibvx/UQcMUXkdKnzA4XVCenScvIHaoZVW0axNFu8xjZu1Fo5rvs0vhWxynQbaMbmx98SAfqeAegEJdscPACR8bj1Xg4y2V4WWzvj6rmgKCbSruBTg==|920
\ No newline at end of file
+}//+0QBNFvh4NP9zRMRvqbvCQwG+++2K2mFJ8dKqFrl4nMtDrg87ktCDXqFb6Vw51r3pBNoYRpDDW3ClqtVkLQ6aEIA9f60gbrQnPhdWs4VaS3Be7iAOpH02KN/jG8J6XDjdOMkM/EhlryLNdBIUAvPRUY0LdJPcrR9aEJBsuYdWGCX7z5bUk5TDgwazIeUeMjI192EX70TFjL9XNK8rawA2Gdig8OM5VZdb5DmvezNcKnWn0Wq7KjdcmrwouPKym0WSzgq1xNzD69vNilOU6B+2fhE2pe42d+kfkRbryy5dSiCCWT2jiOtQZJwbHsOcmSe3BjDuBeaV+D+ngix+6IVcc/l7Sak/DQMUTYIw8gkGelq0Sr+4MQmpsN425ptDD0BuBk8/t5eS+SarD17+Ad3zoWFJy4hq/LxW+sbPKf6DDz3NIuFyTZRQ0LNCm+Ub0kKzD7MoqZkFA2SClXef3fOygel6KPt9R2A8gdlKYRPj7IZoeTYKAwHV8D5K4oUnoTblN4yyxmBdkjd3YKYOHq6h/9ZnjXtkI1gzmegh22wcNijoEwcnTsO3M2b36JPCASybi75Zj7Oa9Ooym/Z+6nw4LNZfnbF1bvgKr6yBKlVzzwbEOqLaHkZYk6p7MOf/KO5g64b+zp6A1ISRgXhh8Nv4nTAfUFHwcHNb5WqZUH4sHu7tIOu7OelrJnjxLBEJB3Ehnhpwd0QrJNe0hcVk8UvXRDAhsVw1YBtEJAt2oXX2rkJpxwFTV9q3+PxoUv1/LYntSczrCeoy7qibRXeazGclVdnNtIzbtB9PqGmQsdouP8+raXqQzcqUpmjHR39fANwOIcNk+G5AZkHX82s6P1KJlvvA3ov44INDiHVIc9GpoFQ98Wj6xkfrn+KtCWKd3X8+qT50Ic3AfJeqFBf/KQF/g==|920
\ No newline at end of file
diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json
index ae9dc0e7..39c53536 100644
--- a/Pages/b90932e038f94707b54e571ff7cd84d.json
+++ b/Pages/b90932e038f94707b54e571ff7cd84d.json
@@ -26,12 +26,18 @@
"DesignLengthInPixel": 25.0,
"IsHidden": true
}
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 25.0
+ }
}
},
"InLogicalVisibleIndexes": [
- 4
+ 4,
+ 5
],
- "Count": 5,
+ "Count": 6,
"DefaultSize": 10.0
},
"Cols": {
@@ -45,7 +51,6 @@
"Count": 3
},
"Values": {
- "0,0": "",
"2,1": "加载中"
},
"AttachInfos": {
@@ -53,7 +58,14 @@
"CssName": "img-cover",
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
- "ToolTip": "操作",
+ "Text": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B6"
+ },
+ "ToolTip": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B6"
+ },
"TemplateKey": "上圆角封面",
"ImagePath": "app-logo横幅.png"
},
@@ -65,6 +77,9 @@
},
"4,1": {
"TemplateCellSource": "ID"
+ },
+ "5,1": {
+ "TemplateCellSource": "项目简介"
}
},
"StyleDatas": {
@@ -76,21 +91,31 @@
{
"FontSize": 16.0,
"HorizontalAlignment": 0
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "Foreground": 1,
+ "HorizontalAlignment": 0
}
],
"Types": {
"Strs": [
"Center",
+ "Background 1 0",
"Body"
]
},
"CellStyles": {
"2,1": 0,
"3,1": 1,
- "4,1": 1
+ "4,1": 1,
+ "5,1": 1
+ },
+ "RowStyles": {
+ "0": 2
},
"SheetStyle": {
- "FontFamily": 1
+ "FontFamily": 2
}
},
"Spans": [
@@ -324,4 +349,4 @@
"Size": "20,20"
}
]
-}//l/Z5o2V5E5yUcs6e67wmcDIKLsBjPPD48ljpURUPiWaM4VMapk5ANwlsLnyu2gKqdnLwIdp3wkw0J9lXMPl1xqucSzvp+5MGamcmnD7cwHrSiabGA/bof6gUtNYvUnOcayU5ejQQg85e2EiBkIE3Y2Y3CjtEqZ3zbGkz+aaE6yFqpr6Wk5Si5ui4oiHtEY6aZ1HDoPiKlsj7fs6WNm0yFbNX/9pNB2sZWYuDd2ivWG67N+i6+4itNCf+HwHesof0HpNS9n6HCygrRTGQ7uvCX7YAVeAM0NYKNiSRz8fRnBWvgUbxBhcbn5FXjph6BUAiiknD/zhfBUGe57z19gRT7c2U0EQ4/69iaMcQVh0NzVuuC0gyUSA0tv0vR7GFmA3U0kgqtEApRjvif+k1iYGG/ouFvsIkX+xOdU3t9GpXDKfTAnR0qNx5XDc8epInu63ZPLs3HY3/hkLtkHPJ5jVkXFO9AmL6nrpXsI77TJrYqT1PohVHoCcepTZ8AR0+8ruscVhM4HQZJLmdSomv10o9vJO7LmjgAmke14aXj+mtOP+bD56DEFmkLyLwrh04jgGibVJqEYVp/zFXQKA+7Gx20NBzvlPvbVSDZ2ZzUfccWrNzuKF6C3OTsqkkcgip5pbiELEsjO0OqQkwKVfup/BAjb1xfAsGfoaClqBCtCYIA1AZhUnMgAK26pGyAmN/hGFmvK/waT5zQ3JlrKxrVRIXPD9pH4KT1VphaUvXGf/b0a8EiBWDPnBO7Any5vUzx9Vyvuq5PPKs9e5akwc7Yvh/1OneCncHoPipbg9braSOZLjSWBq30/boe0j03ZgG7Qlmv0gaywYxu8kjWBMVS0pbJFvTSfVGqUUl57OB3NjpkItZprSZ1Wv5WOhopY9O3Dg7EtTJn+FMdEzLxOeC7JCdig==|920
\ No newline at end of file
+}//PyeZVJmHeIPAXS/2J7/TBhMKdUkRWfes4OQo2v6S4ZKP+8hlPYVWv4Rf2gtTckVa3EDWpZ3crqB8qs9iYKJFZho9ZcV2CbHywP6IV4AQc6PAbW5UkaQ7MIw0H+VhWlzdhZCV+z3mxk/EQGvQ0GCKvV4fM+f1YD34vqAGK5OLkCz15An5ap+3qMY+89fdmFWr2DH/RxPKurPenVSFsch0MOMVGRku3m2VYCa9FAKlrPHrReC/lM3W8GItPrzCrLRa0bOGoWUAXyu4VRkuakQhg53//1+s6TG5Br+54HbugEmppKflZLg1EaRN7COugIUWJ9ClCUwXeOxFWvzSqf2dsJzhIvmIEJLHAXBKEf7Jl3F8nrs/vEO1/F5oN3TqcVvsItWMqrYAaCZDAfSuoqcUBsXI7Pv5Fbj59hfIujygk2t2TQrQ0bleCJuR1twB4zK8HU0+nBEQNNZK6r9WRGrMiWqbdJpLBfB4TTkmPQsQXUYqvLSEClru2THsmMwtYhuh/c6TE9jODu5rGlaumSLVtx87liQhqPAaJcvs0rydr/QhHgyilBVZ7V1lje2CikovNPV1snH23SNhOfC2XK0WKNJ59HUf9uc9KOXzBDwgHKkuR/TX1BFh9TWSgdAl29EwGGdvFLNd0iirJ84xsGpeWYcjrUYkUYynmBYMyHYlIps1pVuFeFXd0nx2oy9uqt9G56TdjNFudWnTJaA+iQvb25JR0C/eG0iaVIMW4wJ9boqbcF5z8bfT32dCIXM77bkIFCJLQSfEDIv2UovXb7V2W1wujH9upyunj9UGe6Khl8JGVQ33JfsDpf5ZOImwlJdO1AdK3ABrF/C4rvc9jp2BanjufdzMDMdEuHn5CHHbdLjdeRAanowFFauJ5H08A0d6Ihnu70MkfIFWTG6rr+f0aA==|920
\ No newline at end of file
diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.rd b/Pages/b90932e038f94707b54e571ff7cd84d.rd
index 4fb0d08c..1fe39772 100644
--- a/Pages/b90932e038f94707b54e571ff7cd84d.rd
+++ b/Pages/b90932e038f94707b54e571ff7cd84d.rd
@@ -1,5 +1,5 @@
{
"PageType": 2,
"ColumnCount": 3,
- "RowCount": 5
+ "RowCount": 6
}
\ No newline at end of file
diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json
index 85b0e34c..79436f18 100644
--- a/Pages/任务/任务-子任务列表.json
+++ b/Pages/任务/任务-子任务列表.json
@@ -258,9 +258,13 @@
"BindingInfo": {
"TableName": "子任务视图",
"ColumnName": "执行者",
- "GUID": "f143be14-aef5-4e30-821d-5cb8dc0b3645"
+ "GUID": "ccc2f590-cc2a-405f-bc28-930c5907547b",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
},
- "ColumnName": "执行者"
+ "ColumnName": "执行者_全名"
},
{
"GUID": "2197d206-fcae-4d33-b5cd-9f0f82907951",
@@ -307,17 +311,57 @@
"Style": 1,
"CommandList": [
{
- "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
- "PropertyItemsList": [
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
{
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-子任务列表'!4:5"
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "='任务-子任务列表'!B2"
+ }
+ ]
+ },
+ "value": "0",
+ "compareType": 1
},
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=NOT('任务-子任务列表'!R6)"
- }
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-子任务列表'!4:5"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT('任务-子任务列表'!R6)"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "bab20077-62a1-44e4-b38b-432fae08548d"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-子任务列表'!折叠子任务列表"
+ },
+ "Value": "0"
+ }
+ ]
+ }
+ ],
+ "ID": "7541ef1b-42c8-47ef-8c46-457ac4c742e3"
}
]
}
@@ -513,4 +557,4 @@
"Formula": "'任务-子任务列表'!$R$6"
}
]
-}//xgcCRMGCJ4eqGvpjUDUFr0yr9dY3fbVU5bcjTRMEUcX9xEt7z7QLOyck7datPnmm/pd4cpavS1jFTMI6ik4ZAJEW3yRoU6Pk3qslMEbrEFsYSSGt+Iq3xTcflw2myQP6L5PFAtCgDyvpdDFSIsunMZM2WTikg4reJStbp3fF/73vAErlPn8HrNIqh/rYeLG2abFE4/ymsJ16MeAX+uaunhOxlI3rA5HNSptsCtvt5X9x7U2tlQCRPWwNfP+8chU83UIILQP8BkoB4vvUkFkr2NkXH13HiRyd5rdn6jyVr2dBCG0UT4tMSP+sQ2BMu5EqY1SWrmysgfu2km7FxmrwFQukZ1aEAmkMJWbx23mXt9o1aVEdh0oc+uObWkndi21KMwdx3TYIFC37pQSH1htNne+zYW4QbRJr4HuP5vSF/eFDOHw8En/TWgrXzU4O5ReW9Czr/vmMA35xHErxdXQzyueZ1zagZTL8J4jZiAlr0xkiixAYo6aYyJCK7y3C3iyyhicMnuOm+X1yQDU8+KWGFehcHGdSN2PawkOXASdmU8nN3gYEjEQaGCtdAxMxK7L06hpvlV4yQAvGJ1ZkswqCKn5aqh7Pbu1nNqcrNLB6ZTfbkWVTsp1mKSl7iEJUufJQTC82qNbNmxWWj2BP69CGrngOOM+FCjTWGme1YO22QZ9szotse7CxfBPV4Ewg3tyHJ4aZVS8i8iUrLtemgmDsgdjlczq2pDlEoP/ud6GfXPZ+FAmCJvQIEfqt2YcEjC4J01SR7xKVL1kpN+N75IXIAqERu4x7PTHQleCVKD/OZjtBfd/pGUFj8WgIvgRZR8pO62uxvkyQ/8W86uZrHr8doBuYMcrXIJjsT5yLbhq59UHhfLDOn6EewvDd8hpriXKiy+p5/IFsdOF+IjsbGEQb8g==|920
\ No newline at end of file
+}//yjjgEl00In/ifCpRcE0XzxO5zBkyNgdGip7KWZDiGJutxasy1hdk6JiuXTlj8Hc8RxFSe/oBr/YTyQdckgaHLoCGF7CrdPuUblcHW8eVHq/x7pYW5LFr23E0EcqZ3KFqGDCkoTYepyB3MHG4EKomTHc29xfEV8fiUDLy4ehA2phqqDWrBDK8ywTamocAT+apKwcwq6IcFpBirRSS76cZe2vpja6Zlo7GWxIpbz2CR1Dm0s8pw3n7dgLRa+mMfJSFWCWO0C5Cd0oxycnMKCJzUezUvMZVBwn/4KUwtOYaHXXiSEc6uzfQSy+q4h2nkGdloBpjvn4/DucZBr9bsTGYZc87mdSGKSqN7a8aX8IKPxnuJ3yQBi9eHC7KbUcT8sz/Plgu7GJPlDb1REQY/4XfQC1suxcSeKKor3d/kcI/WyKMXOCG9FxavzmAkPQDf266iQzJgR9answ1tWyz5DOVdhqsVmma1mduHb7dgWg5oyf29ZkvFswaT5po36JyJTr0UyFWKpYXU9Xp4kNZu04lfzF1G5Ho1kkbbSCBt41MHbTQlKm+TvFXcqauUssUPEN+2riHDB3go8SqBg/5Nf/QaVoioDCjarino0yMhVgSKwodWThZgRBZzkbRcO7icsqfWBSNE+KoaVqlY7k7jyxNF2PiFZrV+wnrhgxiR1aRnlgGbCNBEfOwgudD+6pYcu9ZlDwwQHKEVs/Ob41wbhVQxVktqPvdILeh9Vcp2zZ7EDs/dkVwIAvB0C8k2Fk4Id1Z2RoPE/ipTqf+/uo8gbbEYnfDqFBBaKR/mzRbxuZjknzqu8d9Ss9D4BibhWtXAv+n85IqI9GERB06/heNciCl8XJQ82dPsZV87jttte7zH+l4Nyw4y0HwIAd7FTjBoHFTKlwasVQ/1U1DVpBrV5SakA==|920
\ No newline at end of file
diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json
index f300e41c..e7c94b91 100644
--- a/Pages/任务/工时/修改报工.json
+++ b/Pages/任务/工时/修改报工.json
@@ -305,7 +305,10 @@
},
"DataValidationInfo": {
"IgnoreBlank": false
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"3,10": {
"BindingInfo": {
@@ -345,7 +348,10 @@
},
"DataValidationInfo": {
"IgnoreBlank": false
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"7,1": {
"BindingInfo": {
@@ -382,7 +388,10 @@
"CompareParamType": 4,
"FirstParamValue": "0",
"IgnoreBlank": false
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"11,1": {
"BindingInfo": {
@@ -420,7 +429,10 @@
"CompareParamType": 4,
"FirstParamValue": "0",
"IgnoreBlank": false
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"15,1": {
"BindingInfo": {
@@ -454,7 +466,10 @@
"type": "textarea",
"placeholder": "请输入",
"resize": "vertical"
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"20,1": {
"CellType": {
@@ -565,7 +580,7 @@
"ReloadData": true
}
],
- "ID": "6af3bc10-da58-4b3c-9fc6-bc60aa90f99f"
+ "ID": "851fe04a-ac94-409c-8b03-303c9499aa69"
},
{
"CommandList": [
@@ -580,14 +595,17 @@
"BtnText": "知道了"
}
],
- "ID": "9a01aaf8-a607-4995-80eb-f603186a2f86"
+ "ID": "02302c4b-49ad-41b9-8b82-a5a4ef4ce0cc"
}
]
}
],
"Text": "提交",
"TemplateKey": "_RS_Main1"
- }
+ },
+ "RulesGuidList": [
+ "7fd34ac5-17a0-4f86-b456-c308dea774f8"
+ ]
},
"22,1": {
"BindingInfo": {
@@ -602,6 +620,18 @@
"ColumnName": "任务ID",
"GUID": "a660b772-7e58-481b-80cd-c77a9fb1ba82"
}
+ },
+ "22,7": {
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "请款单ID",
+ "GUID": "90c6426a-9fb6-4224-a97e-883dc182a095",
+ "RelationBinding": {
+ "RelatedTable": "收益请款单表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "状态"
+ }
+ }
}
},
"StyleDatas": {
@@ -844,7 +874,8 @@
"15,1,2,16",
"22,1,1,3",
"22,4,1,3",
- "11,1,1,16"
+ "11,1,1,16",
+ "22,7,1,2"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -879,7 +910,7 @@
]
}
],
- "ID": "053dcf16-cb3c-42c3-a767-9e21bf6a2ba2"
+ "ID": "d8f7688d-1c78-43d5-ad51-6afa6dbef44f"
},
{
"CommandList": [
@@ -896,7 +927,7 @@
]
}
],
- "ID": "735c05d4-ef1d-4d97-b4b7-90be89dcd49c"
+ "ID": "0165accf-8e3e-46a2-9038-689625010508"
}
]
},
@@ -953,7 +984,7 @@
]
}
],
- "ID": "21916420-1fb3-4415-a56b-f14d8a5868b0"
+ "ID": "32fa598e-0c3a-4d6c-aa17-c9befbac17b7"
},
{
"CommandList": [
@@ -970,7 +1001,7 @@
]
}
],
- "ID": "7fadfe8d-86f1-44d6-bc3a-ceb26d92fda0"
+ "ID": "e9bb91eb-573e-49d2-a76c-d648593f930e"
}
]
}
@@ -991,7 +1022,26 @@
},
"RowBreakLines": [],
"RepeatRangeSettings": [],
- "RelatedDataTableName": "任务工时表"
+ "RelatedDataTableName": "任务工时表",
+ "ConditionFormatRulesCollection": {
+ "Rules": [
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=AND(修改报工!请款单状态<>\"\",修改报工!请款单状态<>4)"
+ },
+ "GUID": "7fd34ac5-17a0-4f86-b456-c308dea774f8",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": true,
+ "IsInvisible": false,
+ "IsReadOnly": false
+ }
+ ]
+ }
},
"PrintInfo": {
"PaperSize": {},
@@ -1001,6 +1051,10 @@
{
"Name": "报工ID",
"Formula": "修改报工!$B$23"
+ },
+ {
+ "Name": "请款单状态",
+ "Formula": "修改报工!$H$23"
}
]
-}//Mhx0l5t+ruRH2rr1qWbnw4cjg9ayrqxe/RF29hogQcxFvPV9CfJl7Gk5f5oMjpCEbSHWPAGNxRuJITvRbqkkUJOUx7cb6+DqCFEdTqpQbeXBphtp2FyrsG05L4Nmj9sPGvTjBGPc2T8Ge6DDVGNPRTbVpD9+aaqJfUEfNxI0wjBz+0p5twLo7Q9B0EMPJkSN+5Umz8jL+y2SBmbpUJczl/KyEQY5sZJHTdk07pyR7kJpoKy+SaTU10jHTygsjL+jBlYZLa/iP+rrdsiUthnI+SjHImYHVBoYgYYsYBsuDmyeH5aKRkV1ii5+oD9Wb/XMCVmyqO1tF0yCgWC2PPXtPdEJGqfttsoWbUOAr2idumuSONQafwdCxcEi/a5LrlMcjxnwYN+BWHsJU9b86BF/49jdMnhQZU/Wch5ZQ4SMlfOyGcodN0mNhmHzZPmmvbeIOgaAuw5A2xSbRy3b0b0lmzuV3JHmlk9IsPfyNHoK+DXPZveJmaui1/ILEQ3I3R4TVbdPzuzrbB69YI7KgmJugw+2wLtCnCpL0Sc5hcb7TdfU8kGd4628QF3Nk3u/RuSCPt29700rskMZQtLEwv0nlyw7ZVCPV6+EuxMiS9BNuLehbpRcwVDLPaJdyEUe85D6EbZw5uOoUAsOEgmlalnmLr1Ijhax80NixcK/ppAjPiY/TKqFE5dj/qn5T2CVPHjxPp39khg1Q3KjVF0NC9VLlRoiRKB6GUUar6LbyZ9n+4yPWjitxOOGNSaC8YObrPEaMvE/KV4FoKoYFjQyY7EJrDuMaX9MqGhkUeWjVRRcHY6OTUT5Xlm3x1d7JsB2o57ntp33c+/3AWLwZw1+x8JU/cD8CKAxJETP0kXoHEu+2dZsNlsI+oYB9rFQVwFCRZsmlbQ+0YVVLP/3MZbghulnLg==|920
\ No newline at end of file
+}//W2P3I6BaEtD6xKHuAa+wtRkOmdDv7+SoJs7+fRRl5NDiTAYczI7zaul9qDEO3/eyKa9DzZ0xXnHa2UnoiUQ0hD1I9cAfcsiDtyAZVGsMTDvsPXXQHFtnTxlrg73GjPRzbVa4hDUJkBM0jWYtokuMHB/BbxEAwiL0/gUbv4VzEjVaf3SkbOa/HfQNAZHywoNsxz/Uz4OGM9IGG/eDMq5bCnf52DuElKRO6vBX9TIWHCN9fX8yLrGWxxB+UI41uq805wLdCjHdGWA+heugVPfhB6DAOoRGyyTGKR3rLC4qxilcf3Pbk/nvKbbr7CDPr077nWidhUa/Pzea7bnGQWgpMW3IaR39/sKcqgPB2ECx1TTz4mY+mobzJdTSrUwMNFySavIWwWJlxi7LUwo1kC246e79XItJfbjKuXhANztUanZGCyUvquY+B0MVmUbFNhIhpbYmd8y40OiIAHwJoqsAinVwjbnreAPVDhJrAFtr24Ye6+R5eFwQ+AdEs3wFaOVCGkMW5nPLoIrGXggm0PC7D2+vr7d6G/QbF97XEt9x/DXyDddEL22oO31klJyogsjN2FQx1H1K12ISTn47Z7By/ed00oGqrQ5HpBjdo2nQ+YmJyXnjwBlMiVVKKxHNv4QRww3E5xkRxluHeHdxC/mxKQjwvlOejrN6zoLhxaZmDJVuYrlMqNg3mF/Ig6oN5u6S2laCPv7v1PaLTnc66KNQduSQP9yMUWuQr8uckYPkdG0HPh8MeYLz8HU5K0Zi77tq0IT8ZMVciXVMDX4kJ0fSNwk/0uaD53F5WGhmQQ2tfIXG2SQ0SxCoo+2hwgTMW9JX8iCeLsofN/E6qElLSpoYoOaGhI6GMVd0z94caC76IMbPOSoRB8xvzROx/TxpZ+RRGuTtVxXHmPPG5lL3V2A5lQ==|920
\ No newline at end of file
diff --git a/Pages/任务/工时/修改报工.rd b/Pages/任务/工时/修改报工.rd
index 85da7e83..4982e3ab 100644
--- a/Pages/任务/工时/修改报工.rd
+++ b/Pages/任务/工时/修改报工.rd
@@ -6,6 +6,10 @@
{
"Name": "报工ID",
"Formula": "修改报工!$B$23"
+ },
+ {
+ "Name": "请款单状态",
+ "Formula": "修改报工!$H$23"
}
]
}
\ No newline at end of file
diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json
index 2df99569..1aa19e18 100644
--- a/Pages/任务/工时详情.json
+++ b/Pages/任务/工时详情.json
@@ -341,6 +341,14 @@
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
"PageName": "分配计划工时",
+ "PassValues": [
+ {
+ "Source": "计划",
+ "TargetCell": {
+ "SerializeProperty": "=分配计划工时!工时类型"
+ }
+ }
+ ],
"LoadBindingDataOption": 1
}
],
@@ -366,6 +374,14 @@
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
"PageName": "新增报工",
+ "PassValues": [
+ {
+ "Source": "实际",
+ "TargetCell": {
+ "SerializeProperty": "=新增报工!工时类型"
+ }
+ }
+ ],
"LoadBindingDataOption": 1
}
],
@@ -704,4 +720,4 @@
"Formula": "工时详情!$E$13"
}
]
-}//q5i0UYeToEoiWOrZvUlA+Az+urNpyIkanCO3zUbrS1vLN+bSkABk6lQc7sU6v69BtbrP25yR320pI0KEF4pQ772L3CFSGg6+hpb1Ww/kdikh4ht0OhcUVVsCX2pXdbaBsZZa6FOb8co2yZyb28yn7O543r8couSIN06pASPxiXiQwrzjofgGBMPlzXZ6mOQOkhXaLYE1Mj9wcgQ6zxhdAz4vBvJtZkkfoKpOz0AiktjXc/TjXMuc6qSFu3D34doHGGaAI2a+r7hB03F+tz27orCkrpfq6EgdHXoJwiHJgJWDj8hnRNo7/vthlfLLWGXC27waP4dSB98Tb/4E2WiCK4VLqBQPIG/5/b+CBWvl/FyWl6IGjEDLqOhl3DbJzOLsgNBZrLfnrS7lg69mgVh+T9pfnORlnE7AXLSGochTYXlgAsYN5psQ6/0vXfRR3ctINZIoC11BPosnV+u/CNggS/9CMsJmwdwzt5MNLu8r6IAjv/aMfcOY+rrKaIQxXvHctOpomFzWT2xxpJAwVibf2MmgAsIcLX/WTTd79vzIF2yoDAxjkPClJ0yJ/puZR5b1wl49Vnym3SXK3MzS2ULrfFoDRozkMiAOPlOss2NRLvR1AWNgIMfelzvVu6XOhkAzFqrKVnZl5G0pnGqpYVU2O8MYekvLgZCrQD4wjpy9ZsX5PHorpIMJK4WYEZXMaPQdrdaOgQbEdGf+UKBioCN50dfO/EGeIQj95oD5yDw9r5bljAroFNBGINL2EvUN/dv7VHoQw826HzcQmMsgmptiTnkh9o2P3qBF2AZG6iVxPQXvEe55VOU0trT0vqr+EID9tL2ACHZsltOoofOh6bZW2t6KDPyWjqommr8/3XaJCKylhF5t/YwXL54cPIYn7V7X+MrJ8m8Z5VhHbIYScU6cBw==|920
\ No newline at end of file
+}//0WaU5OwEC0FzGkaxd960W86Hn0GlSSLf9nOuSINkHafhlplmiPAIh4+3F55Ak/58YUSfsOb9u19sL+H+i/20fdxHiILT4ph6ZtH1ma8yx7qXQdR8+3NhmngYAQFTPrL28wjsoYhsmG5sEeWmEp61K+nye/96TmQ2pmwaKlPrhTCqGL584dcr7EdVQ6t/9RDp1aka2Xy6m3ftDBtZ3hLoGyfO+7RhzcZGcvahmFDlS+SxhGyJMrk7ggofeP2W54ahnIe2LwS+uOGgGxszhEh5R3p/2S1iwKRAGpVYMHLzZlRkvrbJbS0Sz66yUrEN76vAWwCxjyO10oVNFXt3jxXGjLpzCpGsJ16py7SIxVINtXS6p2JYz5BprV25GIoLUwfqXQg6JdZFhqVVVk8F0qW4Dzwsvtf35orYeZ+gYCuW1w52WLz2eMt+YIFoesCQJagcLxgR6IV1aeTaLI/7BxJryB83Mz3Su97OTV5TugSZdpt39F71L+WE2ohf5XgNt+fsKbFO8t48qijU4kX7mr3bm16dQFzr6dY0qUkssMXd3WAzivy7UxcyyHKo/9qCcdAsVG7eNGfHvTmTwSULA14k1soDF4CPvlZZYhTD/UvpmU1OjlmB3AEqOe++glacLLftmx4Sp8MgHrigrDxUskl3Czr0R699TaV9eGsB4rwfh9dQNtKZEw+CzAvi5HZ5Jykx93OUWtaLcuzdt3UjJ9J19gIEIX7Iwequ2Bv3w7TrKJt9rWY0IJRIlHcM0eG7CUh2411uxrzO/0Fs1nk0uHJFHneKY3tzPZnhfshfG6V1ioQjwqRCM8c8+u2PbER5v+g7l7ADh519oik+aqh1/a3gAakHyx0jUf9jPhFh8f02SL/WLdWyEvts9fTrz8sBNr0tm2Oyy3K8DCmHaA3On8E6vw==|920
\ No newline at end of file
diff --git a/Pages/收益/办理结算审批单.json b/Pages/收益/办理结算审批单.json
index 3bc6a322..24acb172 100644
--- a/Pages/收益/办理结算审批单.json
+++ b/Pages/收益/办理结算审批单.json
@@ -1,69 +1,59 @@
{
"Rows": {
"RowColumnAttachedInfos": {
- "2": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "3": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
"4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"5": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"7": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"9": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"10": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"11": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"12": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"14": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"15": {
@@ -73,20 +63,45 @@
},
"16": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 77.0
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
}
},
"18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 77.0
+ }
+ },
+ "20": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 22.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 45.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
}
},
"InLogicalVisibleIndexes": [
- 18
+ 20
],
- "Count": 19,
+ "Count": 21,
"DefaultSize": 32.0
},
"Cols": {
@@ -158,46 +173,179 @@
},
"14": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 36.0
}
},
"15": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 36.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 285.0
}
}
},
- "Count": 30,
+ "Count": 32,
"DefaultSize": 32.0
},
"Values": {
- "1,1": "申请日期",
- "1,8": "请款人",
- "1,16": "应付金额",
- "2,8": "%CurrentUser.UserName%",
- "2,16": 0,
- "4,1": "户名",
- "4,16": "付款日期",
- "7,1": "开户行",
- "7,16": "付款科目",
- "10,1": "帐号",
- "10,16": "实际付款金额",
- "13,1": "备注",
- "13,16": "付款凭证"
+ "1,30": "FGC_审批记录",
+ "3,1": "申请日期",
+ "3,8": "请款人",
+ "3,16": "应付金额",
+ "4,8": "%CurrentUser.UserName%",
+ "4,16": 0,
+ "6,1": "户名",
+ "6,8": "开户行",
+ "6,16": "付款日期",
+ "9,1": "帐号",
+ "9,16": "付款科目",
+ "12,1": "备注",
+ "12,16": "实际付款金额",
+ "15,16": "付款凭证",
+ "20,1": "%CurrentUser.UserName%"
},
"Formulas": {
- "11,16": "总金额",
- "5,16": "TODAY()"
+ "13,16": "总金额",
+ "7,16": "TODAY()"
},
"AttachInfos": {
- "2,1": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon",
+ "PreCommands": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中",
+ "VBalidate": true
+ }
+ ],
+ "PostCommands": [
+ {
+ "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon"
+ },
+ {
+ "$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": "=办理结算审批单!Task.Name"
+ }
+ ]
+ },
+ "value": "暂存"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=办理结算审批单!B2"
+ },
+ "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "Refresh"
+ }
+ ],
+ "ID": "bf829f50-ac0c-4bb1-bacf-edffef6c457d"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+ }
+ ],
+ "ID": "27749041-5319-44a2-a8d0-edf13fba01c6"
+ }
+ ]
+ }
+ ],
+ "TemplateKey": "同意",
+ "ActionButtonStyleTemplateInfos": [
+ {
+ "ActionTitle": "提交",
+ "TemplateKey": "同意"
+ },
+ {
+ "ActionTitle": "同意",
+ "TemplateKey": "同意"
+ },
+ {
+ "ActionTitle": "回退",
+ "TemplateKey": "回退"
+ },
+ {
+ "ActionTitle": "暂存",
+ "TemplateKey": "暂存"
+ },
+ {
+ "ActionTitle": "终止",
+ "TemplateKey": "拒绝"
+ },
+ {
+ "ActionTitle": "拒绝",
+ "TemplateKey": "拒绝"
+ }
+ ]
+ }
+ },
+ "1,30": {
+ "CellType": {
+ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
+ "PageName": "FGC_审批记录",
+ "OverflowMode": 1
+ }
+ },
+ "4,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "请款日期",
"GUID": "2f97cc8d-14ee-4f61-92bc-00e50f38453b"
+ },
+ "CellType": {
+ "$type": "ElementUI.DatePickerCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "date",
+ "placeholder": "请选择",
+ "startPlaceholder": "开始日期",
+ "rangeSeparator": "至",
+ "endPlaceholder": "结束日期",
+ "firstDayOfWeek": 1,
+ "DefautWeekFormat": "yyyy 第 WW 周"
}
},
- "2,8": {
+ "4,8": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "请款人",
@@ -206,23 +354,156 @@
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
"UserColumnAttachType": 1
}
+ },
+ "CellType": {
+ "$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "DefaultValue": "%CurrentUser.UserName%",
+ "useBinding": true,
+ "options": [
+ {
+ "value": "黄金糕",
+ "label": "黄金糕"
+ },
+ {
+ "value": "双皮奶",
+ "label": "双皮奶"
+ },
+ {
+ "value": "蚵仔煎",
+ "label": "蚵仔煎"
+ },
+ {
+ "value": "龙须面",
+ "label": "龙须面"
+ },
+ {
+ "value": "北京烤鸭",
+ "label": "北京烤鸭"
+ }
+ ],
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "用户信息视图",
+ "BindingInfos": [
+ {
+ "GUID": "7cc5b242-2ad7-431e-8b34-8bf225d9284b",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "8b3261e7-ee5c-462a-b70e-d7e8a099c64c"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "GUID": "25a6f4a9-5d9c-49a2-a158-0aac09683f0c",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "ad376b2d-51f9-4e92-a519-97c95cb65515"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "CustomColumns": []
+ },
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
}
},
- "2,16": {
+ "4,16": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "总收益",
"GUID": "c8e63e7c-7996-4acc-bfbf-6348055280e6"
}
},
- "5,1": {
+ "7,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "户名",
"GUID": "0d5f791f-a302-415d-9290-142e2a886d67"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "resize": "none"
}
},
- "5,16": {
+ "7,8": {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "开户行",
+ "GUID": "a3e03bd8-8a6c-4cb3-9b09-5bc822ab29d7"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "resize": "none"
+ }
+ },
+ "7,16": {
"BindingInfo": {
"TableName": "付款凭证表",
"ColumnName": "付款日期",
@@ -252,22 +533,51 @@
}
],
"type": "date",
- "placeholder": "请输入",
+ "placeholder": "请选择",
"startPlaceholder": "开始日期",
"rangeSeparator": "至",
"endPlaceholder": "结束日期",
"firstDayOfWeek": 1,
"DefautWeekFormat": "yyyy 第 WW 周"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "8,1": {
+ "10,1": {
"BindingInfo": {
"TableName": "收益请款单表",
- "ColumnName": "开户行",
- "GUID": "a3e03bd8-8a6c-4cb3-9b09-5bc822ab29d7"
+ "ColumnName": "帐号",
+ "GUID": "74744b0a-0d88-45ce-8c65-4db55ad744c3"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "resize": "none"
}
},
- "8,16": {
+ "10,16": {
"BindingInfo": {
"TableName": "付款凭证表",
"ColumnName": "付款科目",
@@ -312,16 +622,25 @@
"loadingText": "加载中"
},
"noMatchText": "无匹配数据"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "11,1": {
+ "13,1": {
"BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "帐号",
- "GUID": "74744b0a-0d88-45ce-8c65-4db55ad744c3"
+ "TableName": "付款凭证表",
+ "ColumnName": "备注",
+ "GUID": "722a1224-c9ea-4dd2-b32a-ec08731b670f"
+ },
+ "CellType": {
+ "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon",
+ "TemplateKey": "_RS_NewLittleRoundCorner",
+ "WaterMark": "请输入",
+ "CommandList": []
}
},
- "11,16": {
+ "13,16": {
"BindingInfo": {
"TableName": "付款凭证表",
"ColumnName": "付款金额",
@@ -346,23 +665,14 @@
],
"min": 0,
"step": 1,
- "placeholder": "请选择",
+ "placeholder": "请输入",
"controls": false
- }
- },
- "14,1": {
- "BindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "备注",
- "GUID": "722a1224-c9ea-4dd2-b32a-ec08731b670f"
},
- "CellType": {
- "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon",
- "TemplateKey": "_RS_NewLittleRoundCorner",
- "CommandList": []
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "14,16": {
+ "16,16": {
"BindingInfo": {
"TableName": "付款凭证表",
"ColumnName": "付款凭证",
@@ -395,36 +705,53 @@
"buttonText": "点击上传",
"tipText": "只能上传jpg/png文件"
}
+ },
+ "20,1": {
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "经手人",
+ "GUID": "85a0b842-b674-4840-9da3-4b939585cc7b"
+ }
}
},
"StyleDatas": {
"Styles": [
{
"FontFamily": 0,
- "FontSize": 13.333333333333332,
- "Formatter": 1
+ "FontSize": 16.0
},
{
"FontFamily": 0,
"FontSize": 13.333333333333332
},
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Foreground": 1,
+ "Formatter": 2
+ },
{
"FontSize": -1.0
},
{
"FontFamily": 0,
"FontSize": 14.666666666666666,
- "Formatter": 2
+ "Formatter": 3
},
{
"BorderRight": 0
},
{
"FontFamily": 0,
- "FontSize": 14.666666666666666,
- "Foreground": 4,
- "Formatter": 5,
- "HorizontalAlignment": 6
+ "FontSize": 18.666666666666664,
+ "Foreground": 5,
+ "Formatter": 6,
+ "HorizontalAlignment": 7
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Foreground": 1
},
{
"FontFamily": 0,
@@ -433,29 +760,36 @@
{
"FontFamily": 0,
"FontSize": 14.666666666666666,
- "Formatter": 7,
- "VerticalAlignment": 8,
+ "FontWeight": 8
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 14.666666666666666,
+ "Formatter": 9,
+ "VerticalAlignment": 10,
"WordWrap": true
},
{
- "Formatter": 7
+ "Formatter": 9
}
],
"Types": {
"Strs": [
"Body",
+ "Text 1 50",
"[AUTO]General",
"yyyy\"年\"m\"月\"d\"日\";@",
"Background 2 -10",
"#FFFF0000",
"¥#,##0_);[Red](¥#,##0)",
"Left",
+ "Bold",
"@",
"Top"
],
"Borders": [
{
- "Color": 3
+ "Color": 4
}
]
},
@@ -467,72 +801,38 @@
"1,5": 1,
"1,6": 1,
"1,7": 1,
- "1,8": 0,
+ "1,8": 1,
"1,9": 1,
"1,10": 1,
"1,11": 1,
"1,12": 1,
"1,13": 1,
- "1,16": 0,
- "2,0": 2,
- "2,1": 3,
- "2,2": 1,
- "2,3": 1,
- "2,4": 1,
- "2,5": 1,
- "2,6": 1,
- "2,7": 1,
- "2,8": 3,
- "2,9": 1,
- "2,10": 1,
- "2,11": 1,
- "2,12": 1,
- "2,13": 1,
- "2,14": 4,
- "2,15": 1,
- "2,16": 5,
- "3,1": 1,
+ "1,14": 1,
+ "1,15": 1,
+ "1,30": 1,
+ "3,1": 2,
"3,2": 1,
"3,3": 1,
"3,4": 1,
"3,5": 1,
"3,6": 1,
"3,7": 1,
- "3,8": 1,
+ "3,8": 2,
"3,9": 1,
"3,10": 1,
"3,11": 1,
"3,12": 1,
"3,13": 1,
- "3,14": 4,
- "4,1": 1,
- "4,2": 1,
- "4,3": 1,
- "4,4": 1,
- "4,5": 1,
- "4,6": 1,
+ "3,16": 2,
+ "4,0": 3,
+ "4,1": 4,
"4,7": 1,
- "4,8": 1,
- "4,9": 1,
- "4,10": 1,
- "4,11": 1,
- "4,12": 1,
- "4,13": 1,
- "4,14": 4,
- "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": 1,
- "5,1": 6,
+ "4,8": 4,
+ "4,14": 5,
+ "4,15": 1,
+ "4,16": 6,
+ "4,29": 6,
+ "5,1": 1,
"5,2": 1,
"5,3": 1,
"5,4": 1,
@@ -545,55 +845,47 @@
"5,11": 1,
"5,12": 1,
"5,13": 1,
- "5,14": 4,
- "5,16": 6,
- "6,1": 6,
- "6,2": 6,
- "6,3": 6,
- "6,4": 6,
- "6,5": 6,
- "6,6": 6,
+ "5,14": 5,
+ "6,1": 7,
+ "6,2": 1,
+ "6,3": 1,
+ "6,4": 1,
+ "6,5": 1,
+ "6,6": 1,
"6,7": 1,
- "6,8": 1,
+ "6,8": 2,
"6,9": 1,
"6,10": 1,
"6,11": 1,
"6,12": 1,
"6,13": 1,
- "6,14": 4,
- "7,1": 0,
- "7,2": 1,
- "7,3": 1,
- "7,4": 1,
- "7,5": 1,
- "7,6": 1,
+ "6,14": 5,
+ "6,16": 7,
+ "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,
+ "7,1": 8,
"7,7": 1,
- "7,8": 1,
- "7,9": 1,
- "7,10": 1,
- "7,11": 1,
- "7,12": 1,
- "7,13": 1,
- "7,14": 4,
- "7,16": 0,
- "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,
- "8,1": 6,
- "8,2": 1,
- "8,3": 1,
- "8,4": 1,
- "8,5": 1,
- "8,6": 1,
+ "7,8": 8,
+ "7,14": 5,
+ "7,16": 8,
+ "7,29": 8,
+ "8,1": 8,
+ "8,2": 8,
+ "8,3": 8,
+ "8,4": 8,
+ "8,5": 8,
+ "8,6": 8,
"8,7": 1,
"8,8": 1,
"8,9": 1,
@@ -601,9 +893,8 @@
"8,11": 1,
"8,12": 1,
"8,13": 1,
- "8,14": 4,
- "8,16": 6,
- "9,1": 1,
+ "8,14": 5,
+ "9,1": 2,
"9,2": 1,
"9,3": 1,
"9,4": 1,
@@ -616,35 +907,26 @@
"9,11": 1,
"9,12": 1,
"9,13": 1,
- "9,14": 4,
- "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": 4,
- "10,16": 0,
- "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,
- "11,1": 6,
+ "9,14": 5,
+ "9,16": 2,
+ "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,
+ "10,1": 9,
+ "10,14": 5,
+ "10,16": 8,
+ "10,29": 8,
+ "11,1": 1,
"11,2": 1,
"11,3": 1,
"11,4": 1,
@@ -657,9 +939,8 @@
"11,11": 1,
"11,12": 1,
"11,13": 1,
- "11,14": 4,
- "11,16": 6,
- "12,1": 1,
+ "11,14": 5,
+ "12,1": 2,
"12,2": 1,
"12,3": 1,
"12,4": 1,
@@ -672,58 +953,64 @@
"12,11": 1,
"12,12": 1,
"12,13": 1,
- "12,14": 4,
- "13,1": 0,
- "13,2": 1,
- "13,3": 1,
- "13,4": 1,
- "13,5": 1,
- "13,6": 1,
- "13,7": 1,
- "13,8": 1,
- "13,9": 1,
- "13,10": 1,
- "13,11": 1,
- "13,12": 1,
- "13,13": 1,
- "13,14": 4,
- "13,16": 0,
- "13,17": 1,
- "13,18": 1,
- "13,19": 1,
- "13,20": 1,
- "13,21": 1,
- "13,22": 1,
- "13,23": 1,
- "13,24": 1,
- "13,25": 1,
- "13,26": 1,
- "13,27": 1,
- "13,28": 1,
- "14,1": 7,
- "14,14": 4,
- "14,16": 6,
- "15,14": 4,
- "16,14": 4,
- "17,1": 6,
- "17,2": 6,
- "17,3": 6,
- "17,4": 6,
- "17,5": 6,
- "17,6": 6,
- "17,7": 6,
- "17,8": 6,
- "17,9": 6,
- "17,10": 6,
- "17,11": 6,
- "17,12": 6,
- "17,13": 6,
- "18,1": 2,
- "18,2": 2,
- "18,3": 2,
- "18,4": 2,
- "18,5": 2,
- "18,16": 8
+ "12,14": 5,
+ "12,16": 2,
+ "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,
+ "13,1": 10,
+ "13,14": 5,
+ "13,16": 8,
+ "13,29": 8,
+ "14,14": 5,
+ "15,14": 5,
+ "15,16": 2,
+ "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,
+ "16,14": 5,
+ "16,16": 8,
+ "16,29": 8,
+ "17,14": 5,
+ "17,29": 8,
+ "18,14": 5,
+ "18,29": 8,
+ "19,1": 8,
+ "19,2": 8,
+ "19,3": 8,
+ "19,4": 8,
+ "19,5": 8,
+ "19,6": 8,
+ "19,7": 8,
+ "19,8": 8,
+ "19,9": 8,
+ "19,10": 8,
+ "19,11": 8,
+ "19,12": 8,
+ "19,13": 8,
+ "20,1": 3,
+ "20,5": 3,
+ "20,16": 11
},
"SheetStyle": {
"FontFamily": 0,
@@ -731,17 +1018,20 @@
}
},
"Spans": [
- "5,16,1,13",
- "8,16,1,13",
- "11,16,1,13",
- "2,16,1,13",
- "11,1,1,13",
- "2,1,1,6",
- "8,1,1,13",
- "5,1,1,13",
- "2,8,1,6",
- "14,16,3,13",
- "14,1,3,13"
+ "7,16,1,13",
+ "10,16,1,13",
+ "13,16,1,13",
+ "4,16,1,13",
+ "16,16,3,13",
+ "13,1,6,13",
+ "1,1,1,15",
+ "1,30,18,1",
+ "10,1,1,13",
+ "7,1,1,6",
+ "7,8,1,6",
+ "4,1,1,6",
+ "4,8,1,6",
+ "20,1,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -760,7 +1050,8 @@
]
},
"RowBreakLines": [],
- "RepeatRangeSettings": []
+ "RepeatRangeSettings": [],
+ "RelatedDataTableName": "付款凭证表"
},
"PrintInfo": {
"PaperSize": {},
@@ -769,7 +1060,7 @@
"CustomNames": [
{
"Name": "总金额",
- "Formula": "办理结算审批单!$Q$3"
+ "Formula": "办理结算审批单!$Q$5"
}
]
-}//nIPp6wcfj6qdKYqPfaA2aQcQfKgCUZ/9waoG7/j9Eis6kBAK+OoK/C7rbrH3Zb6eSSiyUi+4r9tuQntQ84s8tpDbw1SfkyfklcXv6751mWOqKNFLmxlHTqFT6/ZfORJ9808A8G5WpEIR4rcaQndaoB7GGUQGlq6eBeOog6WDgRAMfgx7GprQc49+yxblhXk8oEDgzsmfabG9bxjhrFuoOhU+6a5O3W9EFtBm8i2AH06MjJ1k2c0q6aAbWOFNEiqhu7HDMr1l2IPlv8qBHohXPsQWsoJ3k0URw7OAQPWYG4y95Ao4mNqzlUiq5n1OmY3xEoDQlFBmnNhcZhRR+pLZ0ky365pc0a8NhI9ZnzbQ0+qL3pLosTthgUZIYK+JpEBhc+7/3oybH++gKD6EsM3wQSKtDDYz3lVWdq5Khg9WO6Z/L/1FAXUa1Z+vvNMFdzahROpe3IMgRyCp3ZP08zVIGtIDPN5rlKRAzGTDU7opWbhCH43CZLpsrScm3/qVOn96vyqKqvO9Uo2KvbXlTrIU4Hm9yKJsIPcgNVYCUdCcPU/jV3G0Pbt5RbJ3XlFYSbP4AGsZIdTLaeeMa+PcrE6e8X4Z82Hg6KLSVcHeF43gWwJou5S0MeUyNxiE4bl6+AzyXssuO+DukcPgtEb5qCY92EA0r3IAMoXEg20/5vITwj92C9V9HE9E8ukcar5fZkQNXrOxy3Phja8wgs6Dy800iU6014t+4hivjXLKQMpRHN9N1x6ExPRa6zy3+8TxhCpzC2I15hdQ5tYBJcyPWoTtjDRUkwoWtWjT18GCDFH/ifrBArPI26kO0rUDPNSTa4SA4gK2rh/BFG3bnscvahbOeET167Gf+6c3gOp6q4nQVZNOTt8ohpBv1PnIfWXpOrSXBFYKcTnpqoD9Co870izDgA==|920
\ No newline at end of file
+}//bG2aAdQGhuYFs7Slg190kONGNTcX8QYU78ws+6hsmibcqtV7nBFrriJ7C0pDI7q8VblRFKapg/lOLBpfdzaGSTVYU9b8Kuay9DEQrxIhIkNbhrXckJGcMmjXEK4lv7QjQl30z1+KY38UdsjfgtZWrClxdBE4iDDGK0cr/2Kse+8/5koLQmaeXFnaiHI+r22P4F0Lpkn9G882VvqSbd4X44g0b0PvpATmqmOvA6kqNt9YYyPxXHBd5gOfAuUE8TUoXR5JJY5KtPn2cnFFpLfPFiBu0cUSbg+/frMn4nz8ogM3MqnysKY+G31UzCkf+U0KdFn4inQjhZLA564Z4uUTqQAmWkmQ23AqvLcDOcyNEgzPB/lFCoZFsW1Ze2E81Aca1kCtDwi1jFRu5mPNHtA4cN7CQDP1h+z2fKfzY7pouht1EI2EoqcFe6zO3CVLKTuG/b/hBnx9B6mvVndjXu6NPlZj/tsueVDFwZpHb7Yb25CdRTYLpEQuw1tIA+d2w/enXIJdKb5c/asl2KvRo3K82THwr0yku2+XYo83AuKrBmhEVTKrhfve/PNzkVMq/7+T7pZaLrR3ovR2+I2VutllhbgAkVTGmmrhFGvXLm/pGtwIdwcWHM1isomSNJODypKEHR59X3iA9jskCSKJgWqtIQKhHAm1XyVOAbBHN6dCkieJq6DHjp1Je1M768VLYXE6hFj0bVdf3FsokJ+HGctjMfAhER2i+0MDlHH5jbcFvQMK7c+qMFNPuJivcCwWftOoNDS7PnTqzIwWH/EHGWcDBM9ieirTaejBMkQa7Vk0OsOQer/MZ1iJzqKPahhBjTXqs4M42tm7w7dKuInl8Rs6VF8S6fHwiyL9OQcuOjPI+A4Ct+C8+7RvHXzVwuxssqGoh0AY+H0YL1RU/MlQMaesQg==|920
\ No newline at end of file
diff --git a/Pages/收益/办理结算审批单.rd b/Pages/收益/办理结算审批单.rd
index b96d5aa3..70bc23e7 100644
--- a/Pages/收益/办理结算审批单.rd
+++ b/Pages/收益/办理结算审批单.rd
@@ -1,15 +1,15 @@
{
"PageType": 0,
- "ColumnCount": 30,
- "RowCount": 19,
+ "ColumnCount": 32,
+ "RowCount": 21,
"Formulas": {
- "11,16": "总金额",
- "5,16": "TODAY()"
+ "13,16": "总金额",
+ "7,16": "TODAY()"
},
"CustomNames": [
{
"Name": "总金额",
- "Formula": "办理结算审批单!$Q$3"
+ "Formula": "办理结算审批单!$Q$5"
}
]
}
\ No newline at end of file
diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json
index 9b22977f..82ca8d63 100644
--- a/Pages/收益/审批结算申请单.json
+++ b/Pages/收益/审批结算申请单.json
@@ -1,9 +1,15 @@
{
"Rows": {
"RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0,
+ "Mode": 1
+ }
+ },
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 32.0
}
},
"3": {
@@ -13,22 +19,27 @@
},
"4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"5": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
}
},
"7": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 35.0
}
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 16.0
}
},
"9": {
@@ -36,68 +47,58 @@
"DesignLengthInPixel": 35.0
}
},
- "10": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
"11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "12": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "13": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
- "14": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "15": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 35.0
}
},
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 436.0
+ }
+ },
"16": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"17": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "18": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "20": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "22": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 18.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 29.0
+ }
}
},
"InLogicalVisibleIndexes": [
- 22
+ 17
],
- "Count": 23,
- "DefaultSize": 32.0
+ "Count": 18,
+ "DefaultSize": 35.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -121,11 +122,6 @@
"DesignLengthInPixel": 32.0
}
},
- "5": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -156,11 +152,6 @@
"DesignLengthInPixel": 32.0
}
},
- "12": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"13": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -168,333 +159,270 @@
},
"14": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"15": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
- "35": {
+ "16": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 303.0
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 36.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 284.0
}
}
},
- "Count": 40,
+ "Count": 27,
"DefaultSize": 32.0
},
"Values": {
- "1,1": "申请信息",
- "1,16": "总金额：",
- "1,18": 0,
+ "1,20": "删除请款单",
+ "1,25": "FGC_审批记录",
"3,1": "申请日期",
- "3,8": "请款人",
- "4,8": "%CurrentUser.UserName%",
- "6,1": "收款账户",
- "8,1": "户名",
- "11,1": "开户行",
- "14,1": "帐号",
- "17,1": "备注"
+ "3,9": "请款人",
+ "3,17": "请款金额",
+ "4,9": "%CurrentUser.UserName%",
+ "4,17": 0
},
"AttachInfos": {
- "1,18": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "总收益",
- "GUID": "f9210e7f-eb9b-4bfb-9073-046106c0f6a8"
- }
- },
- "3,16": {
+ "1,1": {
"CellType": {
- "$type": "ElementUI.TableCellType, ElementUI",
- "ElTableName": "EL表格1",
- "SelectionChangedCommand": {
- "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
- "Commands": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算总金额",
- "ParameterValue": "0",
- "ID": "2edd107c63954b7aa8dc6e021e539310"
- },
- {
- "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
- "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\")\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n",
- "ID": "b1a8193c7a4c43d4a4de556c70c22964"
- },
- {
- "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
- "Operation": 16,
- "InParamaterName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!选择项"
- },
- "OperationParamaterAName": ",",
- "OperationParamaterBName": "ID",
- "OutParamaterName": "ID字符串"
- },
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!请款单ID"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!ID字符串"
- }
- },
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!总金额"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!计算总金额"
- }
- }
- ]
- }
- ],
- "ParamProperties": {
- "selection": "选择项"
+ "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon",
+ "PreCommands": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中",
+ "VBalidate": true
}
- },
- "bindingOptions": {
- "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "View_任务工时统计",
- "BindingInfos": [
- {
- "GUID": "59eda730-19f6-4548-ac08-664a8a9ad2b9",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "ID",
- "GUID": "1fa2c161-639e-4571-bc01-d4804b0d5498"
- },
- "ColumnName": "ID"
- },
- {
- "GUID": "ab8ed469-769b-4c69-af59-f4ac1933d844",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "7999cdcf-fa52-4f82-a4e8-ee4f3223c436"
- },
- "ColumnName": "日期"
- },
- {
- "GUID": "eecdf8c2-06c3-433d-afea-0a81b23193ec",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "项目ID",
- "GUID": "c54bd1d6-b90e-460b-9864-1a4881d728b2",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目名称"
- }
- },
- "ColumnName": "项目名称"
- },
- {
- "GUID": "d1deca99-672f-46a4-91eb-16316e069a85",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "任务ID",
- "GUID": "c8e2793d-fe80-4871-90f6-dd8198b27678",
- "RelationBinding": {
- "RelatedTable": "任务表",
- "RelatedColumn": "ID",
- "DisplayColumn": "任务名称"
- }
- },
- "ColumnName": "任务名称"
- },
- {
- "GUID": "95c6c833-b9b2-4d5a-be6d-dd1598c1d4ca",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "时薪单价",
- "GUID": "821ad326-ddbe-41f8-8c88-d34a3d672b03"
- },
- "ColumnName": "时薪单价"
- },
- {
- "GUID": "c78c7539-9d30-4d31-b52f-87bba0f4162c",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "提成系数",
- "GUID": "6362dc06-4e23-452b-a74c-83b0c34b4d34"
- },
- "ColumnName": "提成系数"
- },
- {
- "GUID": "3b210a5b-d615-4fa7-a416-7d6102ad8315",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "实际工时",
- "GUID": "5fff5f41-a4f8-4f91-a020-1e64c598f8c2"
- },
- "ColumnName": "实际工时"
- },
- {
- "GUID": "80a0a5a3-9165-4569-b190-94d3adaa802a",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计算提成",
- "GUID": "cb5082b7-11f7-4dc2-9a8d-a8b0dc01db1e"
- },
- "ColumnName": "收益"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "请款单ID",
- "GUID": "4fd3b85d-fc62-4b2c-9993-962183b033ff"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=审批结算申请单!请款单ID"
- }
+ ],
+ "PostCommands": [
+ {
+ "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon"
},
- "OrderBySqlCondition": {
- "OrderByColumns": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
{
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "e2a5f195-a982-4998-a8a1-8cebd1dd0a52"
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=审批结算申请单!Task.Name"
+ }
+ ]
+ },
+ "value": "暂存"
},
- "Order": 0
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!B2"
+ },
+ "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "Refresh"
+ }
+ ],
+ "ID": "3ba2bdae-dbee-4d71-b0e0-394ac9a2d4a0"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+ }
+ ],
+ "ID": "ca8dcee1-6f7e-47d4-b944-47bcebdcb59c"
}
]
+ }
+ ],
+ "TemplateKey": "同意",
+ "ActionButtonStyleTemplateInfos": [
+ {
+ "ActionTitle": "提交",
+ "TemplateKey": "同意"
},
- "CustomColumns": []
+ {
+ "ActionTitle": "同意",
+ "TemplateKey": "同意"
+ },
+ {
+ "ActionTitle": "回退",
+ "TemplateKey": "回退"
+ },
+ {
+ "ActionTitle": "暂存",
+ "TemplateKey": "暂存"
+ },
+ {
+ "ActionTitle": "终止",
+ "TemplateKey": "拒绝"
+ },
+ {
+ "ActionTitle": "拒绝",
+ "TemplateKey": "拒绝"
+ }
+ ]
+ }
+ },
+ "1,20": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "收益请款单表",
+ "ColumnName": "状态",
+ "GUID": "c74e17b5-dae1-42e7-8885-3f12e4b4c409"
+ }
+ },
+ "value": "4"
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "删除请款单",
+ "Parameters": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "请款单ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!请款单ID"
+ }
+ }
+ ],
+ "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": "22df42b9-3f14-49a4-bc93-e7e50800db22"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!msg"
+ }
+ }
+ ],
+ "ID": "616ab829-cf26-4002-a5d4-4f03f0a04f5b"
+ }
+ ]
+ }
+ ],
+ "ID": "a7c84ab6-8a42-4ee0-8667-77eb350087c7"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": "请先终止请款单流程"
+ }
+ ],
+ "ID": "e51c72e5-21e7-4989-8aa4-b9177dde8348"
+ }
+ ]
+ }
+ ],
+ "Text": "删除请款单",
+ "IsInvisible": true,
+ "TemplateKey": "_RS_Error3",
+ "Icon": {
+ "Name": "Application/037_delete_2.svg",
+ "BuiltIn": true,
+ "Color": "Background 1",
+ "UseCellTypeForeColor": true
},
- "autoGenerateColumnsByDataSource": false,
- "columns": [
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "ID",
- "label": "ID",
- "width": 60,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "resizable": false,
- "hide": true,
- "key": "507db75a-ef63-4d9c-9108-32f531b6bba8"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "日期",
- "label": "日期",
- "formatStr": "yyyy/MM/dd",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "left",
- "key": "e67c50d0-22c7-45ff-b9fb-4d63459443b0"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "项目名称",
- "label": "项目名称",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "showOverflowTooltip": true,
- "key": "6d7731f8-8ff9-4011-af60-eed75614f5bc"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "任务名称",
- "label": "任务名称",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "showOverflowTooltip": true,
- "key": "f4f6ad57-3367-466b-9a73-3e5a9d01f060"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "核定方式",
- "label": "核定方式",
- "width": 100,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "e4938a5d-fe57-402f-998e-5580dc159a61"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "时薪单价",
- "label": "时薪单价",
- "formatStr": " ¥#,##0.00_)",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "7ec6e191-4b18-4380-9dd8-77b20fcafdee"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "提成系数",
- "label": "提成系数",
- "formatStr": "0%",
- "width": 100,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "a849e367-79e0-45ad-9a9a-285a0f1abb3f"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "核定工时",
- "label": "核定工时",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "48a9e9c7-1719-46fe-adea-de68a63d6125"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "收益",
- "label": "收益",
- "formatStr": " ¥#,##0.00_)",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "2c255bd0-201a-491b-a719-34387d8d50ea"
- }
- ],
- "actionButtons": [
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "type": "button",
- "Name": "编辑",
- "shape": "default"
- },
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "type": "button",
- "Name": "删除",
- "styleType": "Accent 5",
- "shape": "default"
- }
- ],
- "sumText": "合计",
- "size": "small",
- "showSelectColumn": true
+ "IconSize": 14.0
+ },
+ "RulesGuidList": [
+ "3b375a5e-c051-4f21-b7d0-9bcb44671c4e"
+ ]
+ },
+ "1,25": {
+ "CellType": {
+ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
+ "PageName": "FGC_审批记录",
+ "OverflowMode": 1
}
},
"4,1": {
@@ -504,7 +432,7 @@
"GUID": "87fce1c8-fecc-4870-b053-37fb8eff263b"
}
},
- "4,8": {
+ "4,9": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "请款人",
@@ -515,11 +443,18 @@
}
}
},
- "9,1": {
+ "4,17": {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "总收益",
+ "GUID": "f9210e7f-eb9b-4bfb-9073-046106c0f6a8"
+ }
+ },
+ "7,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "户名",
- "GUID": "6c75cd77-4206-4b49-8572-3715acf4d8b6"
+ "GUID": "a7a8da56-7cdb-48e9-8666-1731a8e01ace"
},
"CellType": {
"$type": "ElementUI.InputCellType, ElementUI",
@@ -545,11 +480,188 @@
}
],
"type": "text",
- "placeholder": "请输入",
+ "placeholder": "请输入账户名",
+ "PrependText": "账户名",
"resize": "none"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "12,1": {
+ "7,18": {
+ "CellType": {
+ "$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "账户信息",
+ "TableValue": {
+ "TableName": "收款账户信息表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "1b25777c-1c4d-4432-8436-e38553300967",
+ "BindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "收款人",
+ "GUID": "26ce5589-c6c8-4060-a353-012d49fa1f77"
+ },
+ "ColumnName": "收款人"
+ },
+ {
+ "GUID": "ec4017f2-2020-4e75-a962-cf653bed9c5f",
+ "BindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "开户行",
+ "GUID": "c7bbdf8c-3c2d-416e-964f-04a58ad910ff"
+ },
+ "ColumnName": "开户行"
+ },
+ {
+ "GUID": "2b87df8a-0546-4511-a9b3-186584882037",
+ "BindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "帐号",
+ "GUID": "dd7e93bf-6e82-4604-be44-ec2ca330bc43"
+ },
+ "ColumnName": "帐号"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "ID",
+ "GUID": "17cbd7ec-a89e-44d3-9c0f-f7fbed93f216"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!S8"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "205db61199eb4ad1bf246a30c2aef496"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!B8"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!账户信息.收款人"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!B10"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!账户信息.开户行"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!B12"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!账户信息.帐号"
+ }
+ }
+ ]
+ }
+ ],
+ "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": [
+ {
+ "GUID": "83b314d4-e87f-42fe-b719-e49c47936363",
+ "BindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "ID",
+ "GUID": "7aeadfe4-dd14-498d-9235-f37e99e0568f"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "GUID": "3d41a5d0-a484-4b49-8bd6-39fa843c05d9",
+ "BindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "收款人",
+ "GUID": "3cbc2725-db76-45de-9818-c3dc7012c6b4"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "用户",
+ "GUID": "e5270ea6-82d1-44dd-96b1-210862e2d8d8"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ "CustomColumns": []
+ },
+ "placeholder": "选择导入",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据",
+ "clearable": true
+ }
+ },
+ "9,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "开户行",
@@ -579,11 +691,16 @@
}
],
"type": "text",
- "placeholder": "请输入",
- "resize": "none"
+ "placeholder": "请输入开户行",
+ "PrependText": "开户行",
+ "resize": "none",
+ "clearable": true
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "15,1": {
+ "11,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "帐号",
@@ -613,11 +730,16 @@
}
],
"type": "text",
- "placeholder": "请输入",
- "resize": "none"
+ "placeholder": "请输入银行账号",
+ "PrependText": "银行账号",
+ "resize": "none",
+ "clearable": true
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "18,1": {
+ "13,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "备注",
@@ -646,205 +768,830 @@
]
}
],
- "type": "textarea",
- "placeholder": "请输入",
- "resize": "vertical"
+ "type": "text",
+ "maxlength": "128",
+ "showWordLimit": true,
+ "placeholder": "请输入备注",
+ "PrependText": "备注",
+ "resize": "none",
+ "clearable": true
}
},
- "22,1": {
+ "15,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "SelectionChangedCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算总金额",
+ "ParameterValue": "0",
+ "ID": "ad960492173f41e196aac5a0f47c155d"
+ },
+ {
+ "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+ "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n",
+ "ID": "5c32e8400b854052a7446e0c8b16063e"
+ },
+ {
+ "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
+ "Operation": 16,
+ "InParamaterName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!选择项"
+ },
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": "ID",
+ "OutParamaterName": "ID字符串"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!选择ID"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!ID字符串"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!总金额"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!计算总金额"
+ }
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "selection": "选择项"
+ }
+ },
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "任务工时表",
+ "BindingInfos": [
+ {
+ "GUID": "601e1b61-3dd4-4060-9d91-a6f505417a8a",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "7d4db976-ece5-4bae-866e-56f5ac42eefc"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "60fa4d3a-10e0-4d0f-ae8f-a80b55cbce97",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时日期",
+ "GUID": "75a3f063-babf-4cb4-96b7-b8e147a9d894"
+ },
+ "ColumnName": "工时日期"
+ },
+ {
+ "GUID": "2a24d856-b884-46ff-8b33-16f388137ae2",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "项目ID",
+ "GUID": "d3b7a54f-9392-45b1-b7a5-dad20645d96a",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目名称"
+ }
+ },
+ "ColumnName": "项目名称"
+ },
+ {
+ "GUID": "1d7d961f-62c0-450a-bdf5-9f7570fb0425",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "任务ID",
+ "GUID": "5b2b10e6-a471-4bf1-ae1c-85d16f687314",
+ "RelationBinding": {
+ "RelatedTable": "任务平行视图",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "任务名称"
+ }
+ },
+ "ColumnName": "任务名称"
+ },
+ {
+ "GUID": "921c70db-81a4-4782-9b18-204859b2e089",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时",
+ "GUID": "ef8b1b65-2e42-4f2f-9938-9e1ed552f4d6"
+ },
+ "ColumnName": "核定工时"
+ },
+ {
+ "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "预算收益",
+ "GUID": "e73399d1-bf7c-4e8f-bd07-553f794cec81"
+ },
+ "ColumnName": "预算收益"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "请款单ID",
+ "GUID": "ff809989-7a43-47b9-bec9-a1a56b3eeb1b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!请款单ID"
+ }
+ },
+ "CustomColumns": []
+ },
+ "autoGenerateColumnsByDataSource": false,
+ "columns": [
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "ID",
+ "label": "ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "02b51286-fb1c-4cb6-8213-078da1acb7f3",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "项目名称",
+ "label": "项目名称",
+ "minWidth": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "ef8873a5-c358-42f4-ac38-cbc9f2d5ce2d",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "任务名称",
+ "label": "任务名称",
+ "minWidth": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "6835315c-704c-4e7d-a7f3-9d4fa3487a67",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "工时日期",
+ "label": "日期",
+ "formatStr": "yyyy年MM月dd日",
+ "width": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "7444a0b9-613c-4834-b4bc-f6a15205f943",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "时薪来源",
+ "label": "时薪来源",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "675813f4-2a63-4e00-88af-053e70520c5c",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "时薪单价",
+ "label": "时薪单价",
+ "formatStr": "¥#,##0.00_)",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "bab36fc5-a88e-4595-b87a-0be2823955e6",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提成系数",
+ "label": "提成系数",
+ "formatStr": "0.00%",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "52cff03b-69e4-489c-b515-76b55378f421",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "上报工时",
+ "label": "上报工时",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "cd0a56ee-4064-4be4-8ee7-781ce705747c",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "核定工时",
+ "label": "核定工时",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "a8b79f20-733b-45e7-8967-6f87614a8444",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "预算收益",
+ "label": "预算收益",
+ "formatStr": "¥#,##0.00_)",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "right",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "b4738d60-c16d-48e6-9547-411501dd0d4a",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ }
+ ],
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "编辑",
+ "shape": "default"
+ },
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "删除",
+ "styleType": "Accent 5",
+ "shape": "default"
+ }
+ ],
+ "sumText": "合计",
+ "size": "small",
+ "showIndexColumn": true,
+ "stripe": false
+ }
+ },
+ "17,1": {
"BindingInfo": {
"TableName": "收益请款单表",
"ColumnName": "ID",
- "GUID": "5e739753-f9b5-44f4-8a72-0c1d2dd9c0dd"
+ "GUID": "8cfe4dd4-5c7e-4572-8477-179f231fe84f"
+ }
+ },
+ "17,5": {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "状态",
+ "GUID": "354606e1-6c6b-4d20-a976-9feca509bc0f"
+ }
+ },
+ "17,10": {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "流程实例ID",
+ "GUID": "05d6d381-2a0c-467d-badc-482e31c9d62e"
+ },
+ "CellType": {
+ "$type": "Forguncy.NumberCellType, ServerDesignerCommon",
+ "TemplateKey": "_RS_NewLittleRoundCorner",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "ACT_HI_PROCINST_View",
+ "ColumnName": "ID_",
+ "GUID": "40757848-15c0-4d75-943d-190f5232b23f"
+ }
+ },
+ "value": "%Null%"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=审批结算申请单!K18"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_PROCINST_View",
+ "ColumnName": "ID_",
+ "GUID": "d9fef1a8-a73a-4f7a-b18b-742eae7ff46f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!K18"
+ }
+ }
+ },
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "8e797521-e9be-4308-8f81-38f5de12a2f5"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!K18"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "ASSIGNEE_",
+ "GUID": "84e050d8-69dd-48c6-8e64-6405d4a060d5"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ ]
+ }
+ }
+ ],
+ "ID": "d8724fc9-dfca-48a2-bd65-3cd77e37121a"
+ }
+ ]
+ }
+ ]
}
}
},
"StyleDatas": {
"Styles": [
- {
- "FontFamily": 0,
- "FontSize": 13.333333333333332
- },
- {
- "FontFamily": 0,
- "FontSize": 16.0,
- "Foreground": 1
- },
{
"BorderRight": 0
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
+ "FontSize": 16.0
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
+ "Formatter": 2
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
"Formatter": 3
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 14.666666666666666,
- "Foreground": 4,
- "Formatter": 5,
- "HorizontalAlignment": 6
+ "Formatter": 4
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 14.666666666666666,
- "Formatter": 7
+ "Foreground": 5,
+ "Formatter": 6,
+ "HorizontalAlignment": 7
},
{
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
+ "Formatter": 3,
+ "BorderBottom": 0
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "BorderBottom": 0
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
+ "Formatter": 4,
+ "BorderBottom": 0
+ },
+ {
+ "BorderBottom": 0
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
+ "Foreground": 5,
+ "Formatter": 6,
+ "HorizontalAlignment": 7,
+ "BorderBottom": 0
+ },
+ {
+ "FontFamily": 1,
"FontSize": 16.0,
- "Foreground": 1
+ "Foreground": 8,
+ "Formatter": 6,
+ "HorizontalAlignment": 7
},
{
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
+ "Formatter": 2
+ },
+ {
+ "FontFamily": 1,
"FontSize": 14.666666666666666
},
{
- "FontFamily": 0,
- "FontSize": 14.666666666666666
+ "FontFamily": 1,
+ "FontSize": 14.666666666666666,
+ "WordWrap": true
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "BorderRight": 0
}
],
"Types": {
"Strs": [
+ "Background 1 -15",
"Body",
- "black",
- "Background 2 -10",
"[AUTO]General",
- "#FFFF0000",
+ "yyyy/m/d",
+ "yyyy\"年\"m\"月\"d\"日\";@",
+ "black",
"¥#,##0_);[Red](¥#,##0)",
"Left",
- "yyyy\"年\"m\"月\"d\"日\";@"
+ "#FFFF0000"
],
"Borders": [
{
- "Color": 2
+ "Color": 0
}
]
},
"CellStyles": {
- "1,0": 0,
+ "0,24": 0,
"1,1": 1,
- "1,14": 2,
- "1,15": 0,
- "1,16": 3,
- "1,17": 0,
- "1,18": 4,
- "1,19": 0,
- "1,20": 0,
- "1,21": 0,
- "1,22": 0,
- "2,14": 2,
+ "1,20": 2,
+ "1,21": 2,
+ "1,22": 2,
+ "1,23": 2,
+ "1,24": 0,
+ "2,24": 0,
"3,1": 3,
- "3,2": 0,
- "3,3": 0,
- "3,4": 0,
- "3,5": 0,
- "3,6": 0,
- "3,7": 0,
- "3,8": 3,
- "3,9": 0,
- "3,10": 0,
- "3,11": 0,
- "3,12": 0,
- "3,13": 0,
+ "3,2": 2,
+ "3,3": 2,
+ "3,4": 2,
+ "3,5": 2,
+ "3,6": 2,
+ "3,7": 2,
+ "3,8": 2,
+ "3,9": 3,
+ "3,10": 2,
+ "3,11": 2,
+ "3,12": 2,
+ "3,13": 2,
"3,14": 2,
- "3,16": 0,
- "4,1": 5,
- "4,2": 0,
- "4,3": 0,
- "4,4": 0,
- "4,5": 0,
- "4,6": 0,
- "4,7": 0,
- "4,8": 5,
+ "3,15": 2,
+ "3,17": 3,
+ "3,24": 0,
+ "4,1": 4,
+ "4,8": 2,
+ "4,9": 5,
+ "4,10": 2,
+ "4,11": 2,
+ "4,13": 2,
"4,14": 2,
- "5,14": 2,
- "6,1": 6,
- "6,14": 2,
- "7,14": 2,
- "8,14": 2,
- "9,1": 7,
- "9,14": 2,
- "10,1": 7,
- "10,2": 7,
- "10,3": 7,
- "10,4": 7,
- "10,5": 7,
- "10,6": 7,
- "10,14": 2,
- "11,1": 3,
- "11,2": 0,
- "11,3": 0,
- "11,4": 0,
- "11,5": 0,
- "11,6": 0,
- "11,14": 2,
- "12,1": 8,
- "12,14": 2,
- "13,14": 2,
- "14,1": 3,
- "14,2": 0,
- "14,3": 0,
- "14,4": 0,
- "14,5": 0,
- "14,6": 0,
- "14,14": 2,
- "15,1": 8,
- "15,14": 2,
+ "4,15": 2,
+ "4,17": 6,
+ "4,24": 0,
+ "5,1": 7,
+ "5,2": 7,
+ "5,3": 7,
+ "5,4": 7,
+ "5,5": 7,
+ "5,6": 7,
+ "5,7": 7,
+ "5,8": 8,
+ "5,9": 9,
+ "5,10": 9,
+ "5,11": 9,
+ "5,12": 9,
+ "5,13": 9,
+ "5,14": 9,
+ "5,15": 9,
+ "5,16": 10,
+ "5,17": 11,
+ "5,18": 11,
+ "5,19": 11,
+ "5,20": 11,
+ "5,21": 11,
+ "5,22": 11,
+ "5,23": 11,
+ "5,24": 0,
+ "6,1": 4,
+ "6,2": 4,
+ "6,3": 4,
+ "6,4": 4,
+ "6,5": 4,
+ "6,6": 4,
+ "6,7": 4,
+ "6,8": 2,
+ "6,9": 5,
+ "6,10": 5,
+ "6,11": 5,
+ "6,12": 5,
+ "6,13": 5,
+ "6,14": 5,
+ "6,15": 5,
+ "6,17": 12,
+ "6,18": 12,
+ "6,19": 12,
+ "6,20": 12,
+ "6,21": 12,
+ "6,22": 12,
+ "6,23": 12,
+ "6,24": 0,
+ "7,1": 13,
+ "7,18": 14,
+ "7,24": 0,
+ "8,24": 0,
+ "9,1": 14,
+ "9,24": 0,
+ "10,24": 0,
+ "11,1": 14,
+ "11,24": 0,
+ "12,24": 0,
+ "13,1": 15,
+ "13,24": 0,
+ "14,1": 15,
+ "14,2": 15,
+ "14,3": 15,
+ "14,4": 15,
+ "14,5": 15,
+ "14,6": 15,
+ "14,7": 15,
+ "14,8": 15,
+ "14,9": 15,
+ "14,10": 15,
+ "14,11": 15,
+ "14,12": 15,
+ "14,13": 15,
+ "14,14": 15,
+ "14,15": 15,
+ "14,16": 15,
+ "14,17": 15,
+ "14,18": 15,
+ "14,19": 15,
+ "14,20": 15,
+ "14,21": 15,
+ "14,22": 15,
+ "14,23": 15,
+ "14,24": 0,
+ "15,1": 2,
+ "15,24": 16,
+ "15,25": 2,
+ "15,26": 2,
+ "16,1": 2,
+ "16,2": 2,
+ "16,3": 2,
+ "16,4": 2,
+ "16,5": 2,
+ "16,6": 2,
+ "16,7": 2,
+ "16,8": 2,
+ "16,9": 2,
+ "16,10": 2,
+ "16,11": 2,
+ "16,12": 2,
+ "16,13": 2,
"16,14": 2,
- "17,1": 3,
- "17,2": 0,
- "17,3": 0,
- "17,4": 0,
- "17,5": 0,
- "17,6": 0,
- "17,7": 0,
- "17,8": 0,
- "17,9": 0,
- "17,10": 0,
- "17,11": 0,
- "17,12": 0,
- "17,13": 0,
+ "16,15": 2,
+ "16,16": 2,
+ "16,17": 2,
+ "16,18": 2,
+ "16,19": 2,
+ "16,20": 2,
+ "16,21": 2,
+ "16,22": 2,
+ "16,23": 2,
+ "16,24": 16,
+ "16,25": 2,
+ "16,26": 2,
+ "17,1": 2,
+ "17,4": 2,
+ "17,5": 2,
+ "17,9": 2,
+ "17,10": 2,
"17,14": 2,
- "18,1": 8,
- "18,14": 2,
- "19,14": 2,
- "20,14": 2,
- "21,1": 8,
- "21,2": 8,
- "21,3": 8,
- "21,4": 8,
- "21,5": 8,
- "21,6": 8,
- "21,7": 8,
- "21,8": 8,
- "21,9": 8,
- "21,10": 8,
- "21,11": 8,
- "21,12": 8,
- "21,13": 8,
- "22,1": 0,
- "22,2": 0,
- "22,3": 0,
- "22,4": 0,
- "22,5": 0,
- "22,6": 0,
- "22,7": 0,
- "22,8": 0
+ "17,15": 2,
+ "17,16": 2,
+ "17,17": 2,
+ "17,18": 2,
+ "17,19": 2,
+ "17,20": 2,
+ "17,21": 2,
+ "17,22": 2,
+ "17,23": 2,
+ "17,24": 16,
+ "17,25": 2,
+ "17,26": 2
},
"SheetStyle": {
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 13.333333333333332
}
},
"Spans": [
- "15,1,1,13",
- "4,1,1,6",
- "12,1,1,13",
- "9,1,1,13",
- "18,1,3,13",
- "3,16,18,23",
- "4,8,1,6",
- "1,18,1,5",
- "22,1,1,8"
+ "4,9,1,7",
+ "1,25,15,1",
+ "15,1,1,23",
+ "4,1,1,7",
+ "17,1,1,3",
+ "17,5,1,4",
+ "4,17,1,7",
+ "1,20,1,4",
+ "9,1,1,23",
+ "11,1,1,23",
+ "13,1,1,23",
+ "7,1,1,16",
+ "7,18,1,6",
+ "1,1,1,18",
+ "17,10,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -863,42 +1610,44 @@
]
},
"RowBreakLines": [],
- "RepeatRangeSettings": []
+ "RepeatRangeSettings": [],
+ "RelatedDataTableName": "收益请款单表",
+ "ConditionFormatRulesCollection": {
+ "Rules": [
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=审批结算申请单!请款单状态=4"
+ },
+ "GUID": "3b375a5e-c051-4f21-b7d0-9bcb44671c4e",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": false,
+ "IsInvisible": false,
+ "IsReadOnly": false
+ }
+ ]
+ }
},
"PrintInfo": {
"PaperSize": {},
"Margin": {}
},
- "BackgroundPictures": [
- {
- "Name": "BackgroundPicture0",
- "DisplayName": "背景图1",
- "StyleInfo": {
- "Fill": "Accent 1 0"
- },
- "IsAutomaticFill": false,
- "Location": "18,39",
- "Size": "3,18"
- },
- {
- "Name": "28ba3e5b-a2a3-4ff8-886b-039c5c71beea.png",
- "DisplayName": "背景图2",
- "StyleInfo": {
- "Fill": "Accent 1 0"
- },
- "IsAutomaticFill": false,
- "Location": "18,183",
- "Size": "3,18"
- }
- ],
"CustomNames": [
{
"Name": "请款单ID",
- "Formula": "审批结算申请单!$B$23"
+ "Formula": "审批结算申请单!$B$18"
},
{
"Name": "总金额",
- "Formula": "审批结算申请单!$S$2"
+ "Formula": "审批结算申请单!$R$5"
+ },
+ {
+ "Name": "请款单状态",
+ "Formula": "审批结算申请单!$F$18"
}
]
-}//1hnx3qsxNU3fk9HlFs0yT/uyacDEIl5Si4zI3RltBZn+s8F7H7u+fXg6Vu+YDl+QDCDyPSu9U9vF+Ta0nQVGilJ9i55JZSWzfmksvJcnyn+T5RhYbV1XZjdgMaZdtjbESZQZK2AEn1Owtsd+w5THenYyUV7hvbRk62L5b4vKnemwOUBgPYKBGcSRo7ACXlRNCZvuD2rbvbROaWkvAJ+yEL5p80dPIn7dv6K7W6I0/Q7f0CEvn7Zp2+ZuCxGEcdf2IP/tL6VabCaKGiEfB+ntSZk2V4qqZTAk6DjPSKcnOuQrrnImVWup9L/EvG8TFT1x8Z59IeQzxqSDChXF4NhwCBqLonhBMmu30iDQ4kpucdX08N1igQgskk1/vL2vDSmFMdwBLbzWDXwAP7cFuL0PGFbh+PSnqd53iT+5Wk3zd4YsWI3IqCI76FEyWOylhJdGdPQSHCYXN0K/0luXXKUOML86qU9g9oNqoVvAJG+LOMBbTANfWP+S5RnYEAzhFgrj1hk/2eHFr7I/TNTJ6VpGo4HITqq9N030cmGXUqLnpIQHDXgjAoMkY/TIcZcYOm+Ul5ts+FWDLkKLv/5RJINGu3bXQ6bS6S6PckWMFhYT0RwL4vwqcDQBT8xEKJ/IIPrlELae1UZRC2sIaDPGWUC728at1eXhX3L36Qt6459NuY4rG58l8zO+ceAVtNqAIxJbNeoHvQB5JuEC8FOdNWJyptAzq5YeT97sCSbYS7zzKvlDqtrLGn5c2PP0kDihBz40Q6i9Zw5fuaZMo417ak9Ri828r2PZ+lBlOWP7xXK7VYovPWUH25Qsx/Dm8eYhzUqjNBcawaCv9jdEaafykyhGA2s8q7RwoL5Kwv/41YpagKh/rtVrn+NFdkP8SV+nmrbvETC59hyRmbmJoGU9OKI33A==|920
\ No newline at end of file
+}//B+wl1FrP1tE53W72bslOyAD1tzps2eFlsXAZ3WZJEq7G0/S9D2g64kFxLlzQDkYBcteI6fONA5yAll1P0vfP6rvgl1XQ7AjBq9CGQtfiLOGLj3VOV+2jdh/ByBis4hWi9zvZtv3XdEioOVIeo4KuV2dKJB4n/imlcvRjmVSSIR+gdCqh7za3dmNu37Z+74l4yGYNZn2mWQngWCDND5XlnHu/8ViCJF8z5V43efUCs2KI9awF56l3wVzMmW5G+sWjhMnRakwooHUKvDUuUPmv5uM3TurT+khLIa1FFvZ0ClIWbGALUiQC/fQZ/sHR1B8Sn+fafAKpLsyuCLnqd6byV2hCWgEODf6wepl7Ch+G2vmD7dz1q8/T4QGqANvuBGXnIRxezmsiqIa0kBscW2AKxYoFheqio6L7/vGRYopgyhojn7Bmu3DjN8s8Prujk3ozOW6M5XAcYdsuWNQNBR/oWTxxW1P2AsQHuexJXCrsyzvlP3eJqXx1Fm/FTG7REBiSUNa0B3dOovDwHZtMC8aAioKTFqKaIdqm1dXOgBjTfrD4kVy0ol6uJAVZ2BLOZKX8jxtwJkNRCG7yHOSVWM4n6dQW4igN/0QtyEpW+aDeX1quOCWz3LblGhOeavV/Fl6yCoJMos36wcb7LdqgsP729O9aPij8RPbK0P2ybTT8t5urHOUq13xJiQCoxbNVjsfFSlHag1i/dG47tELsLNun/ZNfOcjf5WjE3fWNHtW/RxdNohlY+AyxugiwyCL5z10GCLKIcuYdMDVK+SZ206q7bJLeNV83kcVzqT3qKJ8d8SPt2vCMksbXC8ROXazoXKYlfbeQrNnM3zHKNeK4ZKg4VNZuEElaSUaW0DBNdCUKL7cAbYftqypiLp/ejKkpbEev+Yyra2XqLMJ0sqsbpBLnQQ==|920
\ No newline at end of file
diff --git a/Pages/收益/审批结算申请单.rd b/Pages/收益/审批结算申请单.rd
index 53592c37..9952f819 100644
--- a/Pages/收益/审批结算申请单.rd
+++ b/Pages/收益/审批结算申请单.rd
@@ -1,15 +1,19 @@
{
"PageType": 0,
- "ColumnCount": 40,
- "RowCount": 23,
+ "ColumnCount": 27,
+ "RowCount": 18,
"CustomNames": [
{
"Name": "请款单ID",
- "Formula": "审批结算申请单!$B$23"
+ "Formula": "审批结算申请单!$B$18"
},
{
"Name": "总金额",
- "Formula": "审批结算申请单!$S$2"
+ "Formula": "审批结算申请单!$R$5"
+ },
+ {
+ "Name": "请款单状态",
+ "Formula": "审批结算申请单!$F$18"
}
]
}
\ No newline at end of file
diff --git a/Pages/收益/提交结算申请单.json b/Pages/收益/提交结算申请单.json
deleted file mode 100644
index 722107a6..00000000
--- a/Pages/收益/提交结算申请单.json
+++ /dev/null
@@ -1,1230 +0,0 @@
-{
- "Rows": {
- "RowColumnAttachedInfos": {
- "2": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 18.0
- }
- },
- "3": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "4": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "5": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "7": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
- }
- },
- "10": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "12": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
- "13": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "14": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "15": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
- "16": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "17": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "18": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "19": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "20": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "22": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "24": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
- }
- }
- },
- "InLogicalVisibleIndexes": [
- 24
- ],
- "Count": 25,
- "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
- }
- },
- "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": 24.0
- }
- },
- "15": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
- "39": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "Mode": 2,
- "MinLength": {
- "Unit": 1
- },
- "MaxLength": {
- "Value": 1.0
- }
- }
- }
- },
- "Count": 44,
- "DefaultSize": 32.0
- },
- "Values": {
- "1,1": "申请信息",
- "1,16": "总金额：",
- "1,18": 0,
- "3,1": "申请日期",
- "3,8": "请款人",
- "4,8": "%CurrentUser.UserName%",
- "6,1": "收款账户",
- "10,1": "户名",
- "13,1": "开户行",
- "16,1": "帐号",
- "19,1": "备注"
- },
- "Formulas": {
- "4,1": "TODAY()"
- },
- "AttachInfos": {
- "1,23": {
- "CellType": {
- "$type": "ElementUI.DatePickerCellType, ElementUI",
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!X2"
- },
- "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "GetSelectedRange",
- "RetrunParamNames": {
- "StartValue": {
- "SerializeProperty": "=提交结算申请单!开始日期"
- },
- "EndValue": {
- "SerializeProperty": "=提交结算申请单!结束日期"
- }
- }
- }
- ],
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 4,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "daterange",
- "startPlaceholder": "开始日期",
- "rangeSeparator": "至",
- "endPlaceholder": "结束日期",
- "firstDayOfWeek": 1,
- "DefautWeekFormat": "yyyy 第 WW 周"
- }
- },
- "3,16": {
- "CellType": {
- "$type": "ElementUI.TableCellType, ElementUI",
- "ElTableName": "EL表格1",
- "SelectionChangedCommand": {
- "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
- "Commands": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算总金额",
- "ParameterValue": "0",
- "ID": "cfe9f066a88b4f599aaaf650dee8ebe0"
- },
- {
- "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
- "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n",
- "ID": "fd1b9ad310804ff3a5a3c2fbbddd8369"
- },
- {
- "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
- "Operation": 16,
- "InParamaterName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!选择项"
- },
- "OperationParamaterAName": ",",
- "OperationParamaterBName": "ID",
- "OutParamaterName": "ID字符串"
- },
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!选择ID"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!ID字符串"
- }
- },
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!总金额"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!计算总金额"
- }
- }
- ]
- }
- ],
- "ParamProperties": {
- "selection": "选择项"
- }
- },
- "bindingOptions": {
- "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "View_任务工时统计",
- "BindingInfos": [
- {
- "GUID": "54e9adbe-dbcd-4b32-8af1-99d6b8bc3d1c",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "ID",
- "GUID": "3bed2c81-525f-43bd-810b-ddffb5ae1584"
- },
- "ColumnName": "ID"
- },
- {
- "GUID": "5ea9a7a5-dba7-4767-b86f-a4d5d1d5a2f7",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "3dcd2b6b-8a01-4e26-bbf8-832d6ef99aa7"
- },
- "ColumnName": "日期"
- },
- {
- "GUID": "d9bcae23-fb3f-4e21-9f57-b8b806914f7d",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "项目ID",
- "GUID": "2cde6668-ab8f-4fc8-9e8e-18970ac56f00",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目名称"
- }
- },
- "ColumnName": "项目名称"
- },
- {
- "GUID": "fa578964-bd73-47be-bd4f-d2eef9d67138",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "任务ID",
- "GUID": "0284fb97-cc24-4661-8a1b-1cdb1ee7757a",
- "RelationBinding": {
- "RelatedTable": "任务表",
- "RelatedColumn": "ID",
- "DisplayColumn": "任务名称"
- }
- },
- "ColumnName": "任务名称"
- },
- {
- "GUID": "54c63b5d-66f1-489d-9ab4-c64049a3c924",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "时薪单价",
- "GUID": "0c9be899-1aa6-49fe-9d19-e950eb828096"
- },
- "ColumnName": "时薪单价"
- },
- {
- "GUID": "3d92b706-9a35-4414-b065-988814ebd1e8",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "提成系数",
- "GUID": "0217eabb-9367-44c7-905d-121ff463cc50"
- },
- "ColumnName": "提成系数"
- },
- {
- "GUID": "7411e66d-e732-4439-95f3-c9bbb1ddb787",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计划工时",
- "GUID": "63293471-b8e8-44e9-857e-83f06b6ae819"
- },
- "ColumnName": "计划工时"
- },
- {
- "GUID": "a6da5c12-85d8-40ea-bcb3-682279acce57",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "实际工时",
- "GUID": "b0646e9e-102c-432f-914d-6f39af3abb18"
- },
- "ColumnName": "实际工时"
- },
- {
- "GUID": "11e9478e-f318-45b9-8899-300336913339",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计算提成",
- "GUID": "28d7efd3-ae13-42c9-b2f6-3396012b253a"
- },
- "ColumnName": "收益"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "执行人",
- "GUID": "f845d877-4c1b-402e-9fbf-41238061b0bc"
- },
- "Value": "%CurrentUser%"
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "CompareType": 3,
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "82b92d2b-3f67-4865-b716-a72902015ffe"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!开始日期"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "CompareType": 5,
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "7ee5248f-8a4e-47a3-99ea-486f4dc406f1"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交结算申请单!结束日期"
- }
- },
- {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "请款单ID",
- "GUID": "28e2ed51-8403-4569-b17c-86552bd0d9ec"
- },
- "Value": "%Null%",
- "LeftBracket": 1
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "请款单ID",
- "GUID": "e751c0d8-6ca5-4105-aed1-f7dd3ae3dbd4",
- "RelationBinding": {
- "RelatedTable": "收益请款单表",
- "RelatedColumn": "ID",
- "DisplayColumn": "状态"
- }
- },
- "Value": "4",
- "RightBracket": 1
- }
- ],
- "RelationType": 1
- }
- ]
- },
- "NullFormulaValueQueryPolicy": 1,
- "OrderBySqlCondition": {
- "OrderByColumns": [
- {
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "e2a5f195-a982-4998-a8a1-8cebd1dd0a52"
- },
- "Order": 0
- }
- ]
- },
- "CustomColumns": []
- },
- "autoGenerateColumnsByDataSource": false,
- "columns": [
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "ID",
- "label": "ID",
- "width": 60,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "507db75a-ef63-4d9c-9108-32f531b6bba8"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "日期",
- "label": "日期",
- "formatStr": "yyyy/MM/dd",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "e67c50d0-22c7-45ff-b9fb-4d63459443b0"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "项目名称",
- "label": "项目名称",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "6d7731f8-8ff9-4011-af60-eed75614f5bc"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "任务名称",
- "label": "任务名称",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "f4f6ad57-3367-466b-9a73-3e5a9d01f060"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "核定方式",
- "label": "核定方式",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "e4938a5d-fe57-402f-998e-5580dc159a61"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "时薪单价",
- "label": "时薪单价",
- "formatStr": " ¥#,##0.00_)",
- "width": 120,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "7ec6e191-4b18-4380-9dd8-77b20fcafdee"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "提成系数",
- "label": "提成系数",
- "formatStr": "0%",
- "width": 120,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "a849e367-79e0-45ad-9a9a-285a0f1abb3f"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "计划工时",
- "label": "计划工时",
- "width": 120,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "d095c4f5-87d2-4315-aa33-311eb6ae3123"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "实际工时",
- "label": "实际工时",
- "width": 120,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "3fa6e11b-961e-42ba-ae95-79391122f1bc"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "核定工时",
- "label": "核定工时",
- "width": 120,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "48a9e9c7-1719-46fe-adea-de68a63d6125"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "收益",
- "label": "收益",
- "formatStr": " ¥#,##0.00_)",
- "width": 150,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "key": "2c255bd0-201a-491b-a719-34387d8d50ea"
- }
- ],
- "actionButtons": [
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "type": "button",
- "Name": "编辑",
- "shape": "default"
- },
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "type": "button",
- "Name": "删除",
- "styleType": "Accent 5",
- "shape": "default"
- }
- ],
- "sumText": "合计",
- "size": "small",
- "showSelectColumn": true
- }
- },
- "4,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "请款日期",
- "GUID": "d934b4fa-2c93-48ef-8fd9-b336066703ce"
- }
- },
- "4,8": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "请款人",
- "GUID": "8252372e-e001-4932-bb59-d8a9a3b55c92"
- },
- "CellType": {
- "$type": "ElementUI.SelectCellType, ElementUI",
- "CommandList": [],
- "UIPermissions": [
- {
- "Scope": 2,
- "Enabled": true,
- "AllowRoles": [
- "项目经理"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "DefaultValue": "%CurrentUser.UserName%",
- "useBinding": true,
- "options": [
- {
- "value": "黄金糕",
- "label": "黄金糕"
- },
- {
- "value": "双皮奶",
- "label": "双皮奶"
- },
- {
- "value": "蚵仔煎",
- "label": "蚵仔煎"
- },
- {
- "value": "龙须面",
- "label": "龙须面"
- },
- {
- "value": "北京烤鸭",
- "label": "北京烤鸭"
- }
- ],
- "bindingOptions": {
- "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "用户信息视图",
- "BindingInfos": [
- {
- "GUID": "87c97f40-0616-4ebc-ac20-7fb9469278fd",
- "BindingInfo": {
- "TableName": "用户信息视图",
- "ColumnName": "用户名",
- "GUID": "67e1c669-fba4-40ca-840f-50753c042e58"
- },
- "ColumnName": "value"
- },
- {
- "GUID": "8c3e7d94-0d63-4b69-9304-d2bf15040805",
- "BindingInfo": {
- "TableName": "用户信息视图",
- "ColumnName": "全名",
- "GUID": "8c27f7c7-76fb-4c74-bb71-bee2298a2db9"
- },
- "ColumnName": "label"
- }
- ],
- "CustomColumns": []
- },
- "placeholder": "请选择",
- "noDataText": "无数据",
- "filterInServerOptions": {
- "matchMethod": "contains",
- "loadingText": "加载中"
- },
- "noMatchText": "无匹配数据"
- }
- },
- "8,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": [
- {
- "GUID": "057aff65-2704-4803-9498-cc498e2e422a",
- "BindingInfo": {
- "TableName": "收款账户信息表",
- "ColumnName": "ID",
- "GUID": "9f1227d4-1dff-4478-b7f5-76f54e7ea95c"
- },
- "ColumnName": "value"
- },
- {
- "GUID": "f056aaaf-aa63-4e6f-8569-c47107b3628b",
- "BindingInfo": {
- "TableName": "收款账户信息表",
- "ColumnName": "备注",
- "GUID": "84c5fac0-27ea-44a8-b866-171d4c5b9f96"
- },
- "ColumnName": "label"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "收款账户信息表",
- "ColumnName": "用户",
- "GUID": "a14866bd-836c-46d2-87d5-026c20d72d59"
- },
- "Value": "%CurrentUser.UserName%"
- },
- "CustomColumns": []
- },
- "placeholder": "选择账户",
- "filterInServerOptions": {
- "matchMethod": "contains",
- "loadingText": "加载中"
- },
- "noMatchText": "无匹配数据"
- }
- },
- "11,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "户名",
- "GUID": "4248cde1-f484-427d-8a6f-c3ec4e24caa0"
- },
- "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"
- }
- },
- "14,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "开户行",
- "GUID": "099273cf-c3c7-45f8-9af8-7040bd9a2aa3"
- },
- "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"
- }
- },
- "17,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "帐号",
- "GUID": "369f37b3-4fdc-43a5-b8c4-5d6907d1eaaa"
- },
- "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"
- }
- },
- "20,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "备注",
- "GUID": "0562b2a3-8d81-4c4d-92c5-966dafc597de"
- },
- "CellType": {
- "$type": "ElementUI.InputCellType, ElementUI",
- "CommandList": [],
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 4,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "textarea",
- "placeholder": "请输入",
- "resize": "vertical"
- }
- },
- "24,1": {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "工时ID数组",
- "GUID": "96d4091b-c244-4022-9489-75c9c70f8277"
- },
- "CellType": {
- "$type": "Forguncy.TextCellType, ServerDesignerCommon",
- "SavedValidators": [
- {
- "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
- }
- ],
- "TemplateKey": "_RS_NewLittleRoundCorner"
- }
- }
- },
- "StyleDatas": {
- "Styles": [
- {
- "FontFamily": 0,
- "FontSize": 13.333333333333332
- },
- {
- "FontFamily": 0,
- "FontSize": 16.0,
- "Foreground": 1
- },
- {
- "Foreground": 2,
- "HorizontalAlignment": 3
- },
- {
- "BorderRight": 0
- },
- {
- "FontFamily": 0,
- "FontSize": 13.333333333333332,
- "Formatter": 5
- },
- {
- "FontFamily": 0,
- "FontSize": 14.666666666666666,
- "Foreground": 2,
- "Formatter": 6,
- "HorizontalAlignment": 7
- },
- {
- "FontFamily": 0,
- "FontSize": 14.666666666666666,
- "Formatter": 8
- },
- {
- "FontSize": 16.0,
- "Foreground": 1
- },
- {
- "FontSize": 14.666666666666666
- },
- {
- "FontFamily": 0,
- "FontSize": 14.666666666666666
- },
- {
- "Background": 9,
- "FontFamily": 0,
- "FontSize": 13.333333333333332,
- "Formatter": 10,
- "HorizontalAlignment": 11
- }
- ],
- "Types": {
- "Strs": [
- "Body",
- "black",
- "#FFFF0000",
- "Right",
- "Background 2 -10",
- "[AUTO]General",
- "¥#,##0_);[Red](¥#,##0)",
- "Left",
- "yyyy\"年\"m\"月\"d\"日\";@",
- "#FFFFFF00",
- "@",
- "Center"
- ],
- "Borders": [
- {
- "Color": 4
- }
- ]
- },
- "CellStyles": {
- "1,0": 0,
- "1,1": 1,
- "1,13": 2,
- "1,14": 3,
- "1,15": 0,
- "1,16": 4,
- "1,17": 0,
- "1,18": 5,
- "1,23": 0,
- "2,14": 3,
- "3,1": 4,
- "3,2": 0,
- "3,3": 0,
- "3,4": 0,
- "3,5": 0,
- "3,6": 0,
- "3,7": 0,
- "3,8": 4,
- "3,9": 0,
- "3,10": 0,
- "3,11": 0,
- "3,12": 0,
- "3,13": 0,
- "3,14": 3,
- "3,16": 0,
- "4,1": 6,
- "4,2": 0,
- "4,3": 0,
- "4,4": 0,
- "4,5": 0,
- "4,6": 0,
- "4,7": 0,
- "4,8": 6,
- "4,14": 3,
- "5,14": 3,
- "6,1": 7,
- "6,14": 3,
- "7,14": 3,
- "8,1": 8,
- "8,14": 3,
- "9,14": 3,
- "10,14": 3,
- "11,1": 8,
- "11,14": 3,
- "12,1": 8,
- "12,2": 8,
- "12,3": 8,
- "12,4": 8,
- "12,5": 8,
- "12,6": 8,
- "12,14": 3,
- "13,1": 4,
- "13,2": 0,
- "13,3": 0,
- "13,4": 0,
- "13,5": 0,
- "13,6": 0,
- "13,14": 3,
- "14,1": 9,
- "14,14": 3,
- "15,14": 3,
- "16,1": 4,
- "16,2": 0,
- "16,3": 0,
- "16,4": 0,
- "16,5": 0,
- "16,6": 0,
- "16,14": 3,
- "17,1": 9,
- "17,14": 3,
- "18,14": 3,
- "19,1": 4,
- "19,2": 0,
- "19,3": 0,
- "19,4": 0,
- "19,5": 0,
- "19,6": 0,
- "19,7": 0,
- "19,8": 0,
- "19,9": 0,
- "19,10": 0,
- "19,11": 0,
- "19,12": 0,
- "19,13": 0,
- "19,14": 3,
- "20,1": 9,
- "20,14": 3,
- "21,14": 3,
- "22,14": 3,
- "23,1": 9,
- "23,2": 9,
- "23,3": 9,
- "23,4": 9,
- "23,5": 9,
- "23,6": 9,
- "23,7": 9,
- "23,8": 9,
- "23,9": 9,
- "23,10": 9,
- "23,11": 9,
- "23,12": 9,
- "23,13": 9,
- "24,1": 10
- },
- "SheetStyle": {
- "FontFamily": 0,
- "FontSize": 13.333333333333332
- }
- },
- "Spans": [
- "17,1,1,13",
- "8,1,1,13",
- "4,1,1,6",
- "4,8,1,6",
- "14,1,1,13",
- "11,1,1,13",
- "20,1,3,13",
- "3,16,20,27",
- "1,23,1,20",
- "1,18,1,5",
- "24,9,1,3",
- "24,12,1,3",
- "24,1,1,8"
- ],
- "PageInfo": {
- "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
- "PermissionData": {
- "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
- "permissionResource": {
- "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
- },
- "permissionBindings": [
- {
- "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
- "roleNames": [
- "FGC_LoginUser"
- ]
- }
- ]
- },
- "RowBreakLines": [],
- "RepeatRangeSettings": []
- },
- "PrintInfo": {
- "PaperSize": {},
- "Margin": {}
- },
- "BackgroundPictures": [
- {
- "Name": "BackgroundPicture0",
- "DisplayName": "背景图1",
- "StyleInfo": {
- "Fill": "Accent 1 0"
- },
- "IsAutomaticFill": false,
- "Location": "18,39",
- "Size": "3,18"
- },
- {
- "Name": "28ba3e5b-a2a3-4ff8-886b-039c5c71beea.png",
- "DisplayName": "背景图2",
- "StyleInfo": {
- "Fill": "Accent 1 0"
- },
- "IsAutomaticFill": false,
- "Location": "18,186",
- "Size": "3,18"
- }
- ],
- "CustomNames": [
- {
- "Name": "选择ID",
- "Formula": "提交结算申请单!$B$25"
- },
- {
- "Name": "总金额",
- "Formula": "提交结算申请单!$S$2"
- },
- {
- "Name": "开始日期",
- "Formula": "提交结算申请单!$J$25"
- },
- {
- "Name": "结束日期",
- "Formula": "提交结算申请单!$M$25"
- }
- ]
-}//L3znQD7VdPXToJ/nG4o3usQ7STLnVqlokwMSgCTVPtHKOdRSsB78aVzHyeplPYblD/HvgLIXUWhkVxRPGwD1zGa8T+djwhUbQxhqWUam6MbqGdeveDbrKOlcS/3iLo4SBGxHJ0d+WNAfkcq5kNSsrt42h7Pvz3/B3VvSBGJkWoF5puOy/DD7ZEvEqmK9PMoyjcqHuq94GwD/LapOfDC+BcrmhLH9DKJeGUkOBYmqLXf/phquAGwaMLDMm9vrM/uejGdjzirCTEDUkQ8VZAFnKnMBpbn11VC4JnHYc+6v0twD3cIf6kRwdBcPkFRBFbGTU9hrDkepbMdKCmd/1R6Rcdh7KvgYYz1+QdU3fukSGBB9Wl5etI5SBP1dhZIbL9B1ZjlSUyX58ZPWkkA4A1brgWbv6dSJV/TQ9Eq1FtMTQ+6247TPuKwapB3StUpRDLKTkn5X69MaUKsYUsRQ0WfgTJs0R3/xG7YzjXuwsZ+k+qcyf8u7GgSYS5j8+Clk/IEiezAy+Mvg0MKoLgfEvZaYwePPvTPKaV3EUsqSB33DsqnpXeEd+HIqGkHFeJDhq6TyxT18A6NGy4BOWVoFKG0OVj2BY6agorK3aNJxltafJf+rfl5tl8zpA660w899xw387rL2NdYAJ27l4lulc9c6Zvq5EiptVgMwO+9OiE2T+i11snns0JcLjzXesNg/tt9gedHz+aE2aWS4PF3wsicyjhh6sbZqly+EO7XW18wcus2EtyRwdjNIYZkh8BFK/jvTfjQKpj/DT0Pe2eyAyJJmnpjo9dnIi86e0CvZlYRCLBbzCtAgXX+o17g4vRvKzrUNjxbTDwnw0t81vlFK0YnaSjhMsaT1USCeIbgBJySINv4NS1ltpE1XJKzNS7X6+IX1sA9Lh9vrpJUZT8gxnDoFdQ==|920
\ No newline at end of file
diff --git a/Pages/收益/提交结算申请单.rd b/Pages/收益/提交结算申请单.rd
deleted file mode 100644
index 9f4c9ba5..00000000
--- a/Pages/收益/提交结算申请单.rd
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "PageType": 0,
- "ColumnCount": 44,
- "RowCount": 25,
- "Formulas": {
- "4,1": "TODAY()"
- },
- "CustomNames": [
- {
- "Name": "选择ID",
- "Formula": "提交结算申请单!$B$25"
- },
- {
- "Name": "总金额",
- "Formula": "提交结算申请单!$S$2"
- },
- {
- "Name": "开始日期",
- "Formula": "提交结算申请单!$J$25"
- },
- {
- "Name": "结束日期",
- "Formula": "提交结算申请单!$M$25"
- }
- ]
-}
\ No newline at end of file
diff --git a/Pages/收益/收益中心-变动记录.json b/Pages/收益/收益中心-变动记录.json
index a7287e5b..3c336440 100644
--- a/Pages/收益/收益中心-变动记录.json
+++ b/Pages/收益/收益中心-变动记录.json
@@ -3,7 +3,7 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"1": {
@@ -35,7 +35,7 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"7": {
@@ -49,7 +49,7 @@
7
],
"Count": 8,
- "DefaultSize": 15.0
+ "DefaultSize": 24.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -398,9 +398,20 @@
"align": "left",
"headerAlign": "center",
"colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
"resizable": false,
"hide": true,
- "key": "a27a94e2-4ae6-4815-b020-597af24dcc7e"
+ "key": "a27a94e2-4ae6-4815-b020-597af24dcc7e",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -411,7 +422,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "left",
- "key": "ff0823f0-e986-40e8-81b3-88d40e4089f1"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "ff0823f0-e986-40e8-81b3-88d40e4089f1",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -421,7 +443,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "83b181ac-0c12-48e4-badf-75234c14513a"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "83b181ac-0c12-48e4-badf-75234c14513a",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -431,7 +464,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "1c8795c5-706c-4e75-b2e2-28d4f03b5d6f"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "1c8795c5-706c-4e75-b2e2-28d4f03b5d6f",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -441,18 +485,39 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "b39a13e0-c434-43c5-b301-d4f87ff3d22d"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "b39a13e0-c434-43c5-b301-d4f87ff3d22d",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
"dataColumnName": "开户行",
"label": "开户行",
"minWidth": 200,
- "align": "left",
+ "align": "center",
"headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "db739ea2-2281-406c-aabf-d4a2d0466057"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "db739ea2-2281-406c-aabf-d4a2d0466057",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -462,7 +527,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "392985da-6724-4fed-8f23-c47f0a8b50a8"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "392985da-6724-4fed-8f23-c47f0a8b50a8",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -471,8 +547,18 @@
"align": "left",
"headerAlign": "left",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "15a5be7c-3643-43b4-8973-ce9cfb30d0d2"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "15a5be7c-3643-43b4-8973-ce9cfb30d0d2",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -483,13 +569,38 @@
"align": "center",
"headerAlign": "center",
"colfixed": "right",
- "key": "471c7af1-30b4-4084-86a5-e51ed4a5d8d1"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "471c7af1-30b4-4084-86a5-e51ed4a5d8d1",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
}
],
"showActionButtons": true,
"actionButtons": [
{
"$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
"type": "button",
"Name": "查看",
"shape": "default"
@@ -779,8 +890,8 @@
"Fill": "Accent 1 0"
},
"IsAutomaticFill": false,
- "Location": "3,20",
+ "Location": "3,29",
"Size": "3,18"
}
]
-}//Rh/9RezrvJ+wW/N9TLdoQogmtIGBY/6XSepzE1OqCLZeJ2PnXFrNzc/TrON8YNQzKvbmbzSCcMER7fYld2OQftoSGRUy5dz+0zP+DBhX9wB3aCeniKPsRBJEnluQkFzbn9hOhUJDwm4LOBB7j/h5GAT2XsvyYBjftLWiR2XwBfrkLx+dAKlWX5XiX55lNNg1YfpBVqAi/s5KdmpBM315UsCJ3yFuW+ZDF+y9u4BABRXlQl9HjQOIU8tFjdHVVgIhyk3WW0ulCYidCfx6oybvDBw7cMm5rPeZXU1NWEMPCKtMOiN73ITenR2Kh+Q6mUUTtg/DuRefHzDUA6CQ50fwo6pi3qzxy6PRzhINEk8If7FpJ/xBdKuVlahg2qs8BO1c+2JBZrvdzZX09CUgDf1qTAsgFyrFD8iWzphE0rlGFyaJwSStewNYx94xHJR9hMcEI4nzA5HC5JneZokQfHGsRAo1oMYvd90qfS7wvfpeatpEmUV07m24imkEjg/kdom13zxxhAZJF/l8UKgvbPkOMOHWXUffFnLvoQGVdXLF/uvQ7W0JBA47/d9cqQ17KMfZbTFbT9FB1R/qO8SCPAfXXhiTlYOWOq+8bSp2uCV8eSOj8D/XCqJQQcq23ldYghCQjl1GUJMUDnc0ADzG5FuAheS4I+xoJJ6z3k8q06UaW4DKVABzssoKg9ycsUgO1XTugNIAbFi2B/mmtytmrGtoT5FM0PJeVBKURsD6jb3vPClEjGpeXvB9hWodq/fvY6vFFGaUSFnuq5e2M1Oie6R0r2eZEHTOQgD0YtKlIDhlDa3aY2s3Yoza7NnK7PnVDTBl+tI2+c3sNg7NF7wDvo2sM+FjAUZzXHSeMLqGeyU7GiyDVh4/dNX9Nh2KSxUyGAr9eHMQdRGRdBtDUcUyvZhFcg==|920
\ No newline at end of file
+}//7AH4N73t8GkRQunqPs5GBB5AbDLqS0CyuHaQqYQpTcPwVRpy36XoMfXLgT0XD/T4bren86UTJgqonePoMVaX9sFF/JxP3EnNiKZ+LUzc+KLmJmhGegf+GaKiOG331vOIHJghpSm9s749JOQpacd7zoAsLm+WD64a4DLRpEAZiArNjoGUrqssx1gIdoHw7ggO8FOTUlQ+U4HcSNeVtJeXBik1iMrJ1MhqIxLhVl6Z9aWKSJyvYaiRV7kD7BRhAIKqPCVtpTDv9rQYisiRz7dh4WkG81PNQ1yMZKBfuGkT993lz2nVXI2zl1PdaTN4n0aXV6ewEjjn5sdpIMMMtxHDDlVtMf0/rVOTP8uVkaMEH9LQGYVLO/FVoHH4PbH8lyAwEqGVBOlzh/7JDSIroR9qIxFsEn8+3yjDZ3aALq1TT7UxkBovztighwwR5H8qRukN5HNPe77vkLalRC/JaEfPzLe0onukoxd6sNJd0e7s0noMcm+9wTtf/8pJtJyezYzD7qpsA43evvDYneHcnuHapetp0+0CGXXRgn9TBc0yaN5mdSCmAYwaG8Y9KBfK5M+ET+fFdPdIsNpoUrSqM/mXWV4AVQVFv4RvqWm2VftJCuyjMRuT2JQIrzriOR423nKkmIwKc6c10MFpXH6Z0P7LZSli+dKSOxhUNU1njtXZ+KKrtFvSu4WX/dTNzTIeE7HeYc5Z8t46rYSOJqjbjyAjYuwwXzEjKNqXBcjCP8MN5V1Q6aIdmuc+tseR9o9aAPw0/jxwenpzGaB7ZESRMH2D+yEyhUZqr62TSEme6K3gV2vT11kdqJBnyVTzyNP9pG6QjvUmhcpErVfNfGZHIDhEp5DQaDpOj2P45SJRVGl7rMBVmgxmiaI6FNxXFxbQ9tKvw59xzGOxwRcM2+ZNpfVOnA==|920
\ No newline at end of file
diff --git a/Pages/收益/收益中心-收益明细.json b/Pages/收益/收益中心-收益明细.json
index facc1061..ee122e93 100644
--- a/Pages/收益/收益中心-收益明细.json
+++ b/Pages/收益/收益中心-收益明细.json
@@ -3,7 +3,7 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"1": {
@@ -35,7 +35,7 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"7": {
@@ -49,7 +49,7 @@
7
],
"Count": 8,
- "DefaultSize": 15.0
+ "DefaultSize": 24.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -263,37 +263,32 @@
"ElTableName": "EL表格1",
"bindingOptions": {
"$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"BindingInfos": [
{
- "GUID": "4bf13368-5496-4615-bc7d-d6919977d6d1",
+ "GUID": "bd1149e0-0c5a-44fd-9c95-39d0952f5ad8",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "f9ae0b5c-df5e-4f3a-a23f-5dd29d8a5f81"
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "82426434-61b7-4c55-90db-a2c76279093f"
},
- "ColumnName": "日期"
+ "ColumnName": "ID"
},
{
- "GUID": "2089af2c-0554-46a0-8dd2-89dab81262c8",
+ "GUID": "ae0e2175-ce60-43fb-a2e2-8cd214f93c52",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "项目ID",
- "GUID": "a4f78ee3-5086-45da-8de0-29e2970c0842",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目代号"
- }
+ "TableName": "任务工时表",
+ "ColumnName": "工时日期",
+ "GUID": "8de7b2a2-d467-401b-9016-615338c4fe10"
},
- "ColumnName": "项目代号"
+ "ColumnName": "工时日期"
},
{
- "GUID": "41e2be22-4fb1-4eda-87f0-5225b99d5861",
+ "GUID": "d9f72a1a-4496-48f6-aa2a-1fab5e38dde4",
"BindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"ColumnName": "项目ID",
- "GUID": "51d5ce9f-71d9-4db7-97e7-228fc7396c23",
+ "GUID": "839cbaa0-336b-4a8c-9b7b-13ab380826f9",
"RelationBinding": {
"RelatedTable": "项目表",
"RelatedColumn": "ID",
@@ -303,13 +298,13 @@
"ColumnName": "项目名称"
},
{
- "GUID": "5e937f6c-7fd2-4983-8150-d241d46aa6ff",
+ "GUID": "84208beb-e9f8-434a-adef-9c719c145dc8",
"BindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "46914524-3073-45ab-ab09-a837e29102ae",
+ "GUID": "66b7bcaf-57e6-429c-ad1c-e962dd75f29c",
"RelationBinding": {
- "RelatedTable": "任务表",
+ "RelatedTable": "任务平行视图",
"RelatedColumn": "ID",
"DisplayColumn": "任务名称"
}
@@ -317,56 +312,87 @@
"ColumnName": "任务名称"
},
{
- "GUID": "8b04861a-dad0-4708-a80d-b48a446a1588",
+ "GUID": "50b4163b-edfd-4cc9-95bf-b80a372337ab",
"BindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
+ "ColumnName": "工时类型",
+ "GUID": "971e02f4-2ae7-40db-9935-975ebb22fb8b"
+ },
+ "ColumnName": "工时类型"
+ },
+ {
+ "GUID": "1beb638d-da14-4332-9517-4d685fb980a0",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "执行人",
+ "GUID": "9fb9a37c-7e72-4216-90b5-54b7c4fcb160",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ },
+ "ColumnName": "执行人"
+ },
+ {
+ "GUID": "b17a3b5e-3e7a-4693-a0e5-b106aa4f9363",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "时薪来源",
+ "GUID": "ae3be92a-3536-4127-afb9-b41ced66ea37"
+ },
+ "ColumnName": "时薪来源"
+ },
+ {
+ "GUID": "0fe1f951-3d69-434e-b5a9-71e0b66503b8",
+ "BindingInfo": {
+ "TableName": "任务工时表",
"ColumnName": "时薪单价",
- "GUID": "609d01f2-d0f0-46e9-bdd4-e96c12c24768"
+ "GUID": "3dd7b173-cc97-4df2-a5e3-ed872773c9e8"
},
"ColumnName": "时薪单价"
},
{
- "GUID": "57ec74a7-6ae7-4967-b86c-549f34a7ec12",
+ "GUID": "1d128151-6b14-4718-9235-9ccb1c7449da",
"BindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"ColumnName": "提成系数",
- "GUID": "9c6ab709-7a0a-441c-a34f-35d1bc9f5479"
+ "GUID": "a05a8e66-f8d0-41f7-84de-d01b4faa5ab7"
},
"ColumnName": "提成系数"
},
{
- "GUID": "94429213-9a6b-4b11-8c3f-15771d293fa4",
+ "GUID": "0c07014e-3c9d-41e5-801c-a48f0c0408d9",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计划工时",
- "GUID": "88d26d74-43aa-4304-a0f6-3a9e25b84ac6"
+ "TableName": "任务工时表",
+ "ColumnName": "上报工时",
+ "GUID": "2c9a3172-4ab5-4462-a8fc-17032ca24370"
},
- "ColumnName": "计划工时"
+ "ColumnName": "上报工时"
},
{
- "GUID": "0d7d72d1-208d-4752-80a7-762c873b8a0d",
+ "GUID": "cf2f2738-e148-4f83-a3c1-96c52041d124",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "实际工时",
- "GUID": "e5f3e7c6-29fc-400a-a5e0-65cfebd4bfeb"
+ "TableName": "任务工时表",
+ "ColumnName": "工时",
+ "GUID": "cfa22689-1446-4553-ac48-216bf255d0a7"
},
- "ColumnName": "实际工时"
+ "ColumnName": "核定工时"
},
{
- "GUID": "f1554552-ce38-431b-9769-1a60acd235df",
+ "GUID": "87d5b54f-938c-4b94-9bda-c8d6f0ed9b8e",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计算提成",
- "GUID": "1d8f546a-55c6-467a-b409-e4b2158aa7ac"
+ "TableName": "任务工时表",
+ "ColumnName": "预算收益",
+ "GUID": "7430d011-c05e-47c5-a587-4c064e74ad31"
},
- "ColumnName": "计算收益"
+ "ColumnName": "预算收益"
},
{
- "GUID": "863f3cbe-1122-4f2a-acd4-ed063deea00a",
+ "GUID": "79921239-1d33-4b37-a676-ff2c6374fe90",
"BindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"ColumnName": "请款单ID",
- "GUID": "79c617c1-9810-4bd7-9a5a-74ce496f383b",
+ "GUID": "67f454d3-b40f-420f-a1e5-11a148d3230a",
"RelationBinding": {
"RelatedTable": "收益请款单表",
"RelatedColumn": "ID",
@@ -378,16 +404,7 @@
}
}
},
- "ColumnName": "状态"
- },
- {
- "GUID": "1f9a961a-bf9f-483c-87fe-1457fe022208",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "ID",
- "GUID": "40c01c0e-e555-45af-bf1b-afde2b6a1e30"
- },
- "ColumnName": "ID"
+ "ColumnName": "请款状态"
}
],
"SqlCondition": {
@@ -396,33 +413,20 @@
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
+ "TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "40be89a4-d662-4ece-b0af-e91cfebceb41"
+ "GUID": "77e841b2-c9f1-4555-a820-61f0731fbbc7"
},
- "Value": "shamus"
+ "Value": "%CurrentUser.UserName%"
},
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "CompareType": 2,
"ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "实际工时",
- "GUID": "3bab2356-4c54-4bcc-be4e-a2068e8ef007"
+ "TableName": "任务工时表",
+ "ColumnName": "工时类型",
+ "GUID": "7e32bb2f-a669-4a88-92b2-ef13ca6d0c91"
},
- "Value": "0"
- }
- ]
- },
- "OrderBySqlCondition": {
- "OrderByColumns": [
- {
- "ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "日期",
- "GUID": "8b22be5d-dca9-4dce-a2d2-4f8ddc6e3c94"
- },
- "Order": 1
+ "Value": "实际"
}
]
},
@@ -432,131 +436,302 @@
"columns": [
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "日期",
- "label": "日期",
- "formatStr": "yyyy/MM/dd",
- "width": 150,
+ "dataColumnName": "ID",
+ "label": "ID",
"align": "center",
"headerAlign": "center",
- "colfixed": "left",
- "key": "58aaf29e-0c90-4337-bc4e-8b006d4a4e1f"
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "resizable": false,
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "c4872932-5861-4a42-ae07-d81d8ded03e5",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "项目代号",
- "sortable": true,
- "label": "项目代号",
- "width": 150,
- "align": "left",
- "headerAlign": "left",
+ "dataColumnName": "工时日期",
+ "label": "工时日期",
+ "formatStr": "yyyy年MM月dd日",
+ "align": "center",
+ "headerAlign": "center",
"colfixed": "false",
- "margin": true,
- "key": "6a4f4652-953c-461c-9f78-ffabf66854ca"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "a8fb3c3d-ba4a-4f40-b3d3-d99cc00ba95b",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
"dataColumnName": "项目名称",
- "sortable": true,
"label": "项目名称",
- "width": 200,
- "align": "left",
- "headerAlign": "left",
+ "align": "center",
+ "headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "margin": true,
- "key": "f1a89135-4d91-480c-801e-049415d4bd3e"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "f0a26fdf-3213-4000-b95e-d11e00b6aad7",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
"dataColumnName": "任务名称",
"label": "任务名称",
- "align": "left",
- "headerAlign": "left",
+ "align": "center",
+ "headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "5f87f23c-0495-438e-b6c1-d354759e6082"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "771a570e-5be1-4569-a866-9bd95b5bebe7",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "工时类型",
+ "label": "工时类型",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Tag",
+ "tagType": "primary",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "defc6750-9fdb-4df0-856a-091e73207181",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "执行人",
+ "label": "执行人",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "6a4ebbc6-af0d-4263-990e-2b5255ac865f",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "时薪来源",
+ "label": "时薪来源",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "f37d5960-a5d2-4a43-aa0e-f2e49c504393",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
"dataColumnName": "时薪单价",
"label": "时薪单价",
- "formatStr": " ¥#,##0.00_)",
- "width": 150,
+ "formatStr": "¥#,##0.00_)",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "677f0074-4d1d-4a70-add2-e7a49be982fb"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "a3ef4306-b20a-4952-abdd-de281024be71",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
"dataColumnName": "提成系数",
"label": "提成系数",
- "formatStr": "0%",
- "width": 150,
+ "formatStr": "0.00%",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "28677349-10aa-4cda-9436-a2e055424c34"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "3d8d5e21-f860-4a50-8918-bd17346706d5",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "计划工时",
- "label": "计划工时",
- "width": 150,
+ "dataColumnName": "上报工时",
+ "label": "上报工时",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "251f9bee-f03c-46d3-ae94-a9ceefceaba0"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "144fde0c-c78d-4332-9235-b38a5c671f67",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "实际工时",
- "label": "实际工时",
- "width": 150,
+ "dataColumnName": "核定工时",
+ "label": "核定工时",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "471fb750-abeb-47c5-93b4-b9a254616ad0"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "ded796f0-748b-4ff2-9bf9-731afe331953",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "计算收益",
- "label": "计算收益",
- "formatStr": " ¥#,##0.00_)",
- "width": 150,
+ "dataColumnName": "预算收益",
+ "label": "预算收益",
+ "formatStr": "¥#,##0.00_)",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "5624fac4-3744-4207-a9f3-a91accc3b041"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "6444bbcb-55df-4653-b2ba-fa591bbb6cbc",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "状态",
- "label": "状态",
- "width": 80,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "right",
- "resizable": false,
- "key": "be272a80-5d76-4e7d-93e2-c09672b2b763"
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "ID",
- "label": "ID",
- "width": 60,
+ "dataColumnName": "请款状态",
+ "label": "请款状态",
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "resizable": false,
- "hide": true,
- "key": "cfe56898-f6fb-4c03-83a2-860d06be6541"
+ "type": "Tag",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "f6e8589e-f56d-47b8-b641-22a922fbe61b",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
}
],
"showActionButtons": true,
"actionButtons": [
{
"$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
"type": "button",
"Name": "查看",
"shape": "default",
@@ -602,7 +777,6 @@
"$type": "ElementUI.CellTypes.PaginationCellType, ElementUI",
"AttachElementTable": true,
"ElementTableName": "EL表格1",
- "pageSize": 15,
"pagerCount": 7,
"layout": [
{
@@ -873,8 +1047,8 @@
"Fill": "Accent 1 0"
},
"IsAutomaticFill": false,
- "Location": "3,19",
+ "Location": "3,28",
"Size": "3,18"
}
]
-}//W6quvASgRQnmfiCHgBLRZqPqauoVrYaewW7kwwSfh55mcwfUZmPv++TwBQ6SpOfA6CsmmMez/fXKStR6gmiTUg53v08tgi7omO4/TMA5voB7ga9IWNndIfM38IHK+PoDwyhAcq/S3JkB9hTwKCdgJlwRsKH6TlFN90hz73PinQrxxOfFc4ncWpX/L80zYA9DHklz+thPfZBuOAdB8ah8Zt9tt1RErbRmuMqoovmisK0cyMPhnK/fd3ChISiycnbGsAUGFfvwdSaxlwWazwo43hZm8VwcrKV7srdSA+RYbS6jJyNDvg6fsuPVNwC/389MY8nHKDzwsmlYkvPDQayUq35QvMP68KtcnlDT2v15oDeYH21KpRGfgeEzRlE8K8QAzKMJQ5gtIrIHdRQ3x7rKGhANDXY0hrmsNeBCCfDBDJD2o22DzL1dZ2tL6t2B6PU4AX91rQ/6cDALrdNKAevJDrPpihATUM+BJjG++qjN39ZinxwEv5Yhg0dmiqSzQgNQC+/bCQ3aLpR0yR5Ann5RuXImWV5pUkGmm8IVAyr8k/f1mBtCk6T7dTFjZM5D7LwvOKbM9W2gBlxlnKxwxXhqvcmGrLPVNL8dzTzWEGoe6mzsGdk0UUdT04Z/QkR9FhuGJAPkM1+avhM1vtDrVulzYO731V/HmwdgyNNo4xrCyu/PFLydy4ZNg4BIjTrVI1mBqHL0NoMBrFxGXQwm+Jg7tb0c4h0PoPU5aaa84aqPEf2gcbwdnw2DRyX0B3gejseb9vq4tkG9G3k91JIVBBsrxUQ3770GobZRH1CwfR4hwyzShlCmjz9LwQGHWtVV9U9JDSKvQchMBMH6DV5zyH0cJcTpzSKgaQplEbGCp1c9AQ12lyD73EFpENgQ6w3B6onBMmg2zfo65CxyZ/pebPmQpA==|920
\ No newline at end of file
+}//fUegkgZe7eapivAn4hOHhsp6qsdGnJ2kxPTp9wNaAwLzQade8uLfp989gMSzoCTPYkJoYfMfkobApbf68ebC3ZEAk4MytEprfHhKUDzSySHsHvSf0iZT0ggnLdassJdASfor80uSwhqusr1xyOwMhIrvNJadfbO7cbIYOiy/NOOenixyIDyLDg3OQ3G00ipLhM/+pW9LI/e4zwxFIfn67E8WiGdXi6x3xS9mlM4hoMCMTP06kYupKQ5AtuTzGxTr+d0goTyF0AHIr9/z8ZgIYkCG5BS3bfkElBkN23WHdCUbbcszOBzh4BIFb0k9/3rnvl1J0y2jG9zeoVLVmvefPX47cPkH+MqHDg6I+a6+eO0rcTyOIjnsaxm8E5ARB0tDr3AVOyLXjIkAJ6lGtt7IGMMhEPiDBVL/DPke5HFdIokd+R15JDyecsTNS4j/qaVFoLVNHBxzreNXKbhh3hOxlo69IOCz7Tck72ukcHJiC6E+rOXT0ZOBBJztaE4IwFbUpMZxK1SPMIY6EFdulOEQXc1BW5tLmRjMpJMuEPh28u/lwTiTy7fEmv/ayT15ql22lMKHcK+IoRFkk4Ubof5/bWwNxhSoryb8pqoeS/fqUZ04Iw12PFC+HZJeUFf8D0fOukw8nbL5Ax3F9AiFMJEBx4hnALa08N4K3f0Dp0q+8yqVXbnofq//Na5CgGOCxGRCpYiX8RcA6q0i2uEbICkYEOwdVUVoGF7u4gt9bNWZaW8Ezeu0wyjCw66NhRQ85e9jLt3mXJNufIIEFrs2/h5Miv0HctiISoTCJ+zaaS2hVlrIU6+zZuRM+5FhpXlLsP8TdmaNlAHmWHsK55zAKm1g+LNj6DU1FLV0clhjXQ1KXYFVg+0ENM/AeF6ZKcsNVe3rhdGWlwOSY3CGdZwIl8RSig==|920
\ No newline at end of file
diff --git a/Pages/收益/收益中心-收益请款记录.json b/Pages/收益/收益中心-收益请款记录.json
index 27d7ecca..75732da7 100644
--- a/Pages/收益/收益中心-收益请款记录.json
+++ b/Pages/收益/收益中心-收益请款记录.json
@@ -3,7 +3,7 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"1": {
@@ -35,7 +35,7 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"7": {
@@ -49,7 +49,7 @@
7
],
"Count": 8,
- "DefaultSize": 15.0
+ "DefaultSize": 24.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -342,6 +342,15 @@
},
"ColumnName": "付款金额"
},
+ {
+ "GUID": "c7ceaab6-1e7c-4110-819c-d9bc5ed1d6b7",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "流程实例ID",
+ "GUID": "36dbc026-f29e-4d2e-81ff-0b15ef39ef44"
+ },
+ "ColumnName": "流程实例ID"
+ },
{
"GUID": "5cbf12dc-4d94-417c-9ba9-60a410b73a67",
"BindingInfo": {
@@ -390,9 +399,20 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
"resizable": false,
"hide": true,
- "key": "5fa9ac21-7b21-4c14-8cc5-c5f9da1e042e"
+ "key": "5fa9ac21-7b21-4c14-8cc5-c5f9da1e042e",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -403,7 +423,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "left",
- "key": "0a669200-0ffa-4a26-b0dd-6066c56c244b"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "0a669200-0ffa-4a26-b0dd-6066c56c244b",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -413,7 +444,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "2af1996e-facc-4661-a276-413d94629c72"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "2af1996e-facc-4661-a276-413d94629c72",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -422,8 +464,18 @@
"align": "left",
"headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "8d8756af-393d-4af8-885c-694ed87cc412"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "8d8756af-393d-4af8-885c-694ed87cc412",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -432,8 +484,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "60ae746c-5da5-4460-81a2-bc4e4a7c1366"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "60ae746c-5da5-4460-81a2-bc4e4a7c1366",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -444,7 +506,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "56f8465f-0168-4c28-84c8-b85c8c6e022b"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "56f8465f-0168-4c28-84c8-b85c8c6e022b",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -455,7 +528,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "5a6d3649-1599-4664-ac0c-4674587df276"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "5a6d3649-1599-4664-ac0c-4674587df276",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -465,8 +549,18 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "showOverflowTooltip": true,
- "key": "bcd75bc7-1398-4a5b-9266-3209b72048a4"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "bcd75bc7-1398-4a5b-9266-3209b72048a4",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
},
{
"$type": "ElementUI.ColumnSetting, ElementUI",
@@ -477,13 +571,61 @@
"align": "center",
"headerAlign": "center",
"colfixed": "false",
- "key": "db6e98b0-40f3-4b26-a84f-e23551ced546"
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "db6e98b0-40f3-4b26-a84f-e23551ced546",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "流程实例ID",
+ "label": "流程实例ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "resizable": false,
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "915052e5-3369-4e9f-8363-a78686eabf16",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
}
],
"showActionButtons": true,
"actionButtons": [
{
"$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
"type": "button",
"Name": "查看",
"shape": "default",
@@ -507,6 +649,7 @@
},
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "ShowDrawerHeader": true,
"PageName": "审批结算申请单",
"LoadBindingDataOption": 1
}
@@ -806,8 +949,8 @@
"Fill": "Accent 1 0"
},
"IsAutomaticFill": false,
- "Location": "3,18",
+ "Location": "3,27",
"Size": "3,18"
}
]
-}//hgUS3R+je9z+mP7mjw8rpJLz6A8EES1lgqz+z91WuQ9R7xwFHDBglOxLpN7Wc1pP5REeEYV4T0fqgLOwAWidT6I5n+NN5Hxy7LC2csb9Dq5zuzGxvc7QX8OLqKPFhffX26IGgBqylY357AemElzuAMK+P6P2I528hvt77yCza4c2WhF+x1s/ZpD5cXOjEd0mNcbuBT4w+UAafliLyBRKoj2tPzA6+A9iUWtWLCoDtSHKUXKsNvGTwc5gZy6cCzBwWEQuQt2YEfAH6fkgrW4l0T7y8+z8j+AJQwesYjJ7Y5x0LROmrgctS13OQxUK1WaJCZwRrmKg0F5ddcuz1V6rls655EKkrNwV/Cd3DKKotSIdkay23P1QSA60Bz1xflRYNHZbDvpZe+8WAD9S3kByLo9yxApIKP/eBu5MvfwiPr4wVsDgRzYOAAJ3DaHb4ffMJPUUi1KAbeLF7RVyR832VHS6APKqM09TeAhNP2Oyw6qLsanoTUjPTM2CFr2W8+poxW0KTx4nHexEVccyceh3ke4ztbpo6BhlKvwWCMLJ+KkeK6/T876JONWoOJGtiIn64H2Zc2u3gbAGqq3UVzfHjnf7KHhjAHtFvbbOr2UyLmMp52eCUYGW/wi3TR+bIADKpyYxsNIr0Am+OIi+0DjObKj8QjDDz8nuzQEFdR63oCYZaT6cRpwGC9BnDOnLIoOCvI17Xs7us++c/Of01c96hCwIKBktgm10PnCKS+wIoLEQzQND6Iwj8CBT+bvM557GdSpWUXezUyG+DqVAV3m5bdFeB/eeqWgMBc0pfBdjWv3EGDCN2hLwH+ow6xbXv71tM+tkgo+DhCqTUgc0HQWnfGPTMSuJojgUHBKN5OaTdSMmJk/kING+uHyBnKpvov4t/MA/NlpOkTx0T8fEfKCyBA==|920
\ No newline at end of file
+}//Ont0gagcQEHUQZSpzfQsmwQ+BA2j+vZcO1c3qhaOI6ggeeUzUgRrub+jyRL+vcsPYioTlBTGofrnpzUy5cZte5zM0xpVypXH7AYFUTFEikoDNDa5QqUnm1xuJmBo7oGcXTrNJiZ9zP88GpJbSMaJLZX7vXct2ilj1BnjBcGbYRWPluXUgvtFxJEkgDfTiyYlfuUZOib64YW/tvKD0YH89a9y1GXCfYV67h4vUcb9KhXrZuuQ9K+TKQAZ1DbC3f+e7v26rOnmP1DhpiW7uSv+x1sGs2OVUUmWRUlY1iPZPL95ppp3a2Iv8th1Jq8LCTt+ok5TZeYNHvUFgfX8+tfFFEXntLuiYU2ttorM59nf0nFH8QUvDnsHUBmix1QTpVLaQThKy+C56elyixsmFnHFXxv0x73w4fj1BQR8K0NAEjpTVjJbcwww/XCA2GCSdCBIwrT8oI/bLF2tD+YeWtdWGmSIVcBer6aSpf+IB7OXkmqLdxqQuGQFJP791jh/brFZB1gtzhEkc2JIMwe/ZTFTKbWJuo0Y+0/HGBdefvIFYjvKQJJpsBnwuZPSGFdsDNV6568F9+wCjL7CVENeaT3EhXOaqAYtuVHDOmlWJoaZjuro+LowLRPMKyUlxqjZsjgUILURoRd0F7itByWh2bOzjpGrlIEKcS/zasG7hk6WD61hGJct1D2SNBFa7lHpJkUXH0ILWmZJ3UOK6O7c1zRLSVaJGgQM74HI4V+8W4jbLheKQYXPCV/A0JQrwNQSoxNibGbkRV0WE1U/pNCY3GPL3tk6g/l/YpCB0Me/1FcWhV9eIbgS84xo8xOgrB1UtJXhsxrwJChWWs3HSwJXTAcNWlsezCLYo5lG9D3vdc2whwzVd5r2tLlY4E57MvnxauYuAGwgxjA5PdQBhycKtkXkXQ==|920
\ No newline at end of file
diff --git a/Pages/收益/收益中心.json b/Pages/收益/收益中心.json
index 3b1bdda8..0e742f1c 100644
--- a/Pages/收益/收益中心.json
+++ b/Pages/收益/收益中心.json
@@ -139,7 +139,14 @@
},
"20": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
}
},
"21": {
@@ -227,36 +234,106 @@
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
- "ProcessDefinitionResourceName": "结算申请",
- "ReturnResultName": "发起流程结果"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=收益中心!发起流程结果.TaskExists"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PageName": "FGC_任务详情"
- }
- ],
- "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面",
- "ID": "d781d8a5-41bb-4c58-9b0b-2912b32a13fc"
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "ClosePopupCallbackCommand": {
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=是否为确定"
+ }
+ ]
+ },
+ "value": "1"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
+ "ProcessDefinitionResourceName": "结算申请",
+ "ProcessInstanceName": "新的请款申请",
+ "SelectedTable": "收益请款单表",
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "ID",
+ "GUID": "2555b81d-87cd-47df-9cea-213d79406467"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=收益中心!借款单ID"
+ }
+ },
+ "ReturnResultName": "发起流程结果"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=收益中心!发起流程结果.TaskExists"
+ }
+ ]
+ },
+ "value": "1"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "ShowDrawerHeader": true,
+ "ValueFormula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=收益中心!发起流程结果.Page"
+ },
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面",
+ "ID": "837bb750-0ce5-443b-b89b-c67e672e36e9"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+ "FunctionName": "warning",
+ "Title": "温馨提示",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=收益中心!发起流程结果.ErrorMessage"
+ },
+ "BtnText": "知道了"
+ }
+ ],
+ "ID": "0d147168-53ee-4851-84ff-3c1be06338eb"
+ }
+ ]
+ }
+ ],
+ "ID": "cd1ff481-6b6a-437f-9976-2e20e7694b4e"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "借款单ID": "借款单ID"
}
- ]
+ },
+ "PageName": "生成结算申请单",
+ "LoadBindingDataOption": 2
}
],
"Text": "结算申请",
@@ -329,6 +406,9 @@
"FontFamily": 0,
"FontSize": 13.333333333333332
},
+ {
+ "Background": 2
+ },
{
"Foreground": 2
}
@@ -461,9 +541,13 @@
"11,2": 3,
"11,3": 3
},
+ "RowStyles": {
+ "6": 4,
+ "8": 4
+ },
"ColStyles": {
- "0": 4,
- "40": 4
+ "0": 5,
+ "40": 5
},
"SheetStyle": {
"FontFamily": 0
@@ -517,4 +601,4 @@
"Formula": "收益中心!$D$12"
}
]
-}//WdytOEjOk1GyXTv+hqzfdRY4u4AAR8awpjzFO98wkTb6foyNqxCnIB2GsV76nu9f5DbYGROwj99FWvYdoUqGhXGDNzGT/A3TJLXnBj4FHj0Ok0lWYPvBz6h0gEzGFlU1JKKQdG0YndZwPzq3ll/pKLb6qETJpzePC8TjGA4rRkr1tlTP3vlUxKwaJVM2AGpV2ajmRkWpRzD2L9Oe/cvVm0ZwamsLdEeJF8WnKKokIdQJlNKS1ouGWcqXkuBtziX7G8ria0XOO6o8CI3ASVILW42Uw+B9hEa/qNLbscmrblqI18uG0OCHNXXUM9vF/3Oscq5O2JhuBz54GjX6JK6snfzOvKzPOVLIUFxjucbzC8CpRIOwj1SBWMC/DY+ADA6uEM1y96pYvrFd0FfZsl5lW5xIJ2lWo0x+JaUZy2d8c8w8Utk97JzOUTbcIR8qlh9EP2cve/K22GBGLkghN/ge0jNl4nwGZIXZn97BtaoL5ur6stjY6W/314L3hXgW3o2L4QgCdZlmZV7Yz2PSi9tsnuggDN2lfRcAhy1rRoJXFWBCvf9ct7knC7uyeUm9vv9MiFL+kLwEov9MUoK3AnnI0rv6vzPJAxj4z+YIpfGzZwPS+hHvFbleKCzcYyFKDgdLMUItj2joIVXCFXyN8utIGlVi72oiHQ8meYelACHBZdsBv4hK+YOkr10zOaMund/u7VqsdLQkNLCHX+VoiEzaaKPBMDHXB++XnNGEv15vPBpYn0Kfr5G/hlRUy1wxOGC/h+w8yyeykQrAlXCOra19C7BqXWqPZNMUNVuJCRDTU/s0grqz+Ny7NvT8EZad3huf5TGMftu6gbpUycQSUt3GmzBocPDBmzy9xTAyctaGyogXq1IFdyFD3G45Ey8y+aFv3WLo4+naS875SBDiCFWgYA==|920
\ No newline at end of file
+}//dcD+A6TLpqmv8BHNEAxwBkPK1fSOTxN8kT4xz5tx71hroIXk6Iq/LkN4vtlBbiaeLgDiBqIRQSrNFBNKUW0Zvq47OunWQSiZMeMNsjbD0PdmzhwnlBjXuqeNdhmCtxfz+RxPuERbEZPHdTKkJ1k3aksFOtOhOL3T4RsTHPmj0x5NS14OOAhs0/qg7pn8Rux+Kd7k6SGnnYM4uY/Lbb0D27UGRtOn8KVVCykA/vm1ihrERR4n6eStbWsHtuiY9A/3dEFWutp5HC6Ug7Ow4k4KG5E15Y32ALg8mpubbdSN02qZ5BaZnHe9f+6BRgeWT5fD+BttsGxj0dTJgtsZ/voCvFyNEO0X791PjsagEEuY1saQrSTePt64v18yPgpPepXwsWENizEiVHBoGa7vt8XdSU4W1cC15Yb57YxddNpislX1jovDMRFIGKPrOjs9MhpO3Rj582OrwK1W+/1vFHKsklOhrtQKw9AwmjiZBjaYtdChVoOmnjsLkXHUgs/G342rgjIKwy2kTMIxCBtD8DIz6M8kl4IP2z8aP/SjvvDLBtHg8kJV10pxu8BAXtGvSgflRZxOc7unGnrrCRxpZMeAHJuNppLFaOLHqHqYRbNTAEj/xQU8Kqob9VEjMs8hFJISCV76xdTq+ApY4hV7tIif/e/olOjMV7EWLSXN8Tu0gaJCSw1LYsRoQok+dl5Y12jiQunCot7t74nrueNRyhpPXm304ZGIiPRLox20oZfz84YvLn0noANoaZGJLZSLwN9lENdL3gPTAXW3H9Q4/Vt2WJgrH/N1UtPX7KJ0N19JnuTF5f0KuS7GnS1sQSu21pP5uKwjHU38TsDKYE7KlCNCcH05bJ/kqdUBokUEIJAwD5FLSagMdYxCd73OHDin4Oih7CcWKwFxrLAuHNAOqFfsbQ==|920
\ No newline at end of file
diff --git a/Pages/收益/生成结算申请单.json b/Pages/收益/生成结算申请单.json
new file mode 100644
index 00000000..9390ebf1
--- /dev/null
+++ b/Pages/收益/生成结算申请单.json
@@ -0,0 +1,951 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 508.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 6
+ ],
+ "Count": 7,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 30.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 36,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,29": 0,
+ "1,31": "生成结款单"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "ElementUI.DatePickerCellType, ElementUI",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!B2"
+ },
+ "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "GetSelectedRange",
+ "RetrunParamNames": {
+ "StartValue": {
+ "SerializeProperty": "=生成结算申请单!开始日期"
+ },
+ "EndValue": {
+ "SerializeProperty": "=生成结算申请单!结束日期"
+ }
+ }
+ }
+ ],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "daterange",
+ "startPlaceholder": "开始日期",
+ "rangeSeparator": "至",
+ "endPlaceholder": "结束日期",
+ "firstDayOfWeek": 1,
+ "DefautWeekFormat": "yyyy 第 WW 周"
+ }
+ },
+ "1,31": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!B4"
+ },
+ "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "GetSelectedRow",
+ "RetrunParamNames": {
+ "SelectedRow": {
+ "SerializeProperty": "选择行"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=生成结算申请单!选择行.length"
+ }
+ ]
+ },
+ "value": "0",
+ "compareType": 2
+ },
+ "CommandList": [
+ {
+ "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
+ "Operation": 16,
+ "InParamaterName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!选择行"
+ },
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": "ID",
+ "OutParamaterName": "ID字符串"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "username",
+ "ParameterValue": "%CurrentUser%",
+ "ID": "4a774835f284413eb706ba4b79727b81"
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "生成请款单",
+ "Parameters": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "请款人",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!username"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "工时任务ID数组",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!ID字符串"
+ }
+ }
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
+ },
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ },
+ "ReturnPropertiesTo": [
+ {
+ "ResultPropertyName": "请款单ID",
+ "ResultTo": {
+ "SerializeProperty": "新请款单ID"
+ }
+ }
+ ],
+ "RefreshAfterFinish": true,
+ "CheckDataValidation": true
+ },
+ {
+ "$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": "=code"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=新请款单ID"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$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": "f197e07a-8015-41d9-a9e7-984afd859e37"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!msg"
+ }
+ }
+ ],
+ "ID": "defd4739-d28f-43c1-b809-2218447c22a0"
+ }
+ ]
+ }
+ ],
+ "ID": "cafaf375-0b1a-4643-a89c-9080bff504ae"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": "请至少选择一行"
+ }
+ ],
+ "ID": "9dbbdf45-97aa-410d-9030-d4c485a2d413"
+ }
+ ]
+ }
+ ],
+ "Text": "生成结款单",
+ "TemplateKey": "_RS_Main1",
+ "Icon": {
+ "Name": "账单.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "SelectionChangedCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算总金额",
+ "ParameterValue": "0",
+ "ID": "77b9f89b5c6948c6915156e47dd0cf6d"
+ },
+ {
+ "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+ "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"核定收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n",
+ "ID": "fd1b9ad310804ff3a5a3c2fbbddd8369"
+ },
+ {
+ "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
+ "Operation": 16,
+ "InParamaterName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!选择项"
+ },
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": "ID",
+ "OutParamaterName": "ID字符串"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!选择ID"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!ID字符串"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!总金额"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!计算总金额"
+ }
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "selection": "选择项"
+ }
+ },
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "任务工时表",
+ "BindingInfos": [
+ {
+ "GUID": "601e1b61-3dd4-4060-9d91-a6f505417a8a",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "8efab3c0-b70a-4dde-985c-b0515eceeebe"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "60fa4d3a-10e0-4d0f-ae8f-a80b55cbce97",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时日期",
+ "GUID": "03f21d79-93fc-4f74-8bb8-a5ace091d0f0"
+ },
+ "ColumnName": "工时日期"
+ },
+ {
+ "GUID": "2a24d856-b884-46ff-8b33-16f388137ae2",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "项目ID",
+ "GUID": "9baf86cd-3147-42dd-962e-793f60422e4a",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目名称"
+ }
+ },
+ "ColumnName": "项目名称"
+ },
+ {
+ "GUID": "1d7d961f-62c0-450a-bdf5-9f7570fb0425",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "任务ID",
+ "GUID": "1cacd6ed-5550-4c6a-a835-b490ebc42b56",
+ "RelationBinding": {
+ "RelatedTable": "任务平行视图",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "任务名称"
+ }
+ },
+ "ColumnName": "任务名称"
+ },
+ {
+ "GUID": "947ea417-dad8-4504-a1a6-3b94f534e46e",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "时薪来源",
+ "GUID": "cbd066d9-38d6-43c3-a942-eb34c20ace46"
+ },
+ "ColumnName": "时薪来源"
+ },
+ {
+ "GUID": "c616d706-8d4a-4ea8-a881-1b9f22aa4f6e",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "时薪单价",
+ "GUID": "026a0c2d-ead1-4cfc-ae28-10736ee6cb98"
+ },
+ "ColumnName": "时薪单价"
+ },
+ {
+ "GUID": "f1f7aea9-5e25-44f3-bc01-fb49382da320",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "提成系数",
+ "GUID": "eae3921c-f948-4623-89b9-1740b0329de3"
+ },
+ "ColumnName": "提成系数"
+ },
+ {
+ "GUID": "b6bdfe74-39aa-45fd-82e1-5a8cbcf669ce",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "上报工时",
+ "GUID": "1e478658-28b1-4f00-80a0-27212e481d9d"
+ },
+ "ColumnName": "上报工时"
+ },
+ {
+ "GUID": "921c70db-81a4-4782-9b18-204859b2e089",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时",
+ "GUID": "843a0a51-1dfd-4389-a3aa-620523410135"
+ },
+ "ColumnName": "核定工时"
+ },
+ {
+ "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "预算收益",
+ "GUID": "24631ec6-e1ef-4819-a036-18b6874158b7"
+ },
+ "ColumnName": "核定收益"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "执行人",
+ "GUID": "14cac787-9bc8-4a8f-ab47-cc65a9dab1dc"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时类型",
+ "GUID": "55eb8067-b82b-4f2a-8b5c-586c3d6cd1e2"
+ },
+ "Value": "实际"
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "CompareType": 3,
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时日期",
+ "GUID": "b93ca30f-6ca4-4e70-b539-b7fc5754b0d6"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!开始日期"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "CompareType": 5,
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时日期",
+ "GUID": "6647497d-8d9f-42e4-b90c-e4f25f1cc53d"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成结算申请单!结束日期"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "是否请款",
+ "GUID": "dbfa8eda-8005-4b29-a415-e6d345c93c4b"
+ },
+ "Value": "0"
+ }
+ ]
+ },
+ "NullFormulaValueQueryPolicy": 1,
+ "CustomColumns": []
+ },
+ "autoGenerateColumnsByDataSource": false,
+ "columns": [
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "ID",
+ "label": "ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "02b51286-fb1c-4cb6-8213-078da1acb7f3",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "项目名称",
+ "sortable": true,
+ "label": "项目名称",
+ "minWidth": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "filter": true,
+ "multipleFilter": true,
+ "showOverflowTooltip": false,
+ "key": "ef8873a5-c358-42f4-ac38-cbc9f2d5ce2d",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "任务名称",
+ "sortable": true,
+ "label": "任务名称",
+ "minWidth": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "filter": true,
+ "multipleFilter": true,
+ "showOverflowTooltip": false,
+ "key": "6835315c-704c-4e7d-a7f3-9d4fa3487a67",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "工时日期",
+ "sortable": true,
+ "label": "工时日期",
+ "formatStr": "yyyy年MM月dd日",
+ "width": 130,
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "filter": true,
+ "multipleFilter": true,
+ "key": "7444a0b9-613c-4834-b4bc-f6a15205f943",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "时薪来源",
+ "sortable": true,
+ "label": "时薪来源",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "filter": true,
+ "multipleFilter": true,
+ "key": "675813f4-2a63-4e00-88af-053e70520c5c",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "时薪单价",
+ "sortable": true,
+ "label": "时薪单价",
+ "formatStr": "¥#,##0.00_)",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "bab36fc5-a88e-4595-b87a-0be2823955e6",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提成系数",
+ "sortable": true,
+ "label": "提成系数",
+ "formatStr": "0%",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "52cff03b-69e4-489c-b515-76b55378f421",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "上报工时",
+ "sortable": true,
+ "label": "上报工时",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "cd0a56ee-4064-4be4-8ee7-781ce705747c",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "核定工时",
+ "sortable": true,
+ "label": "核定工时",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "a8b79f20-733b-45e7-8967-6f87614a8444",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "核定收益",
+ "sortable": true,
+ "label": "核定收益",
+ "formatStr": "¥#,##0.00_)",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "right",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "b4738d60-c16d-48e6-9547-411501dd0d4a",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ }
+ ],
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "编辑",
+ "shape": "default"
+ },
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "删除",
+ "styleType": "Accent 5",
+ "shape": "default"
+ }
+ ],
+ "sumText": "合计",
+ "size": "small",
+ "showSelectColumn": true
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Foreground": 1,
+ "Formatter": 2,
+ "HorizontalAlignment": 3
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 4
+ },
+ {
+ "FontSize": -1.0
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body",
+ "#FFFF0000",
+ " \"结算金额：\"¥#,##0",
+ "Right",
+ "[AUTO]General"
+ ]
+ },
+ "CellStyles": {
+ "1,0": 0,
+ "1,1": 0,
+ "1,14": 0,
+ "1,15": 0,
+ "1,16": 0,
+ "1,17": 0,
+ "1,18": 0,
+ "1,19": 0,
+ "1,20": 0,
+ "1,26": 0,
+ "1,27": 0,
+ "1,28": 0,
+ "1,29": 1,
+ "1,31": 2,
+ "1,35": 0,
+ "3,1": 0,
+ "3,35": 0,
+ "4,35": 0,
+ "6,1": 0,
+ "6,2": 0,
+ "6,3": 0,
+ "6,4": 0,
+ "6,5": 0,
+ "6,6": 0,
+ "6,7": 3,
+ "6,8": 3,
+ "6,9": 3
+ },
+ "SheetStyle": {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332
+ }
+ },
+ "Spans": [
+ "3,1,2,34",
+ "1,1,1,13",
+ "6,1,1,3",
+ "6,4,1,3",
+ "1,31,1,4"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "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": [],
+ "RelatedDataTableName": "收益请款单表"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "总金额",
+ "Formula": "生成结算申请单!$AD$2"
+ },
+ {
+ "Name": "开始日期",
+ "Formula": "生成结算申请单!$B$7"
+ },
+ {
+ "Name": "结束日期",
+ "Formula": "生成结算申请单!$E$7"
+ }
+ ]
+}//hZc7PW0xEDMIXzz4YQWjTCaqXwQe3z66+Ld9g00IECHqfgj0rIHZXKxNYqzDzJizhI6lBp4Hu7PUeLhOfLxxjiXA9qj+I7vzd/L+1kXrUAGkg3bZs0Ng+C4F9XfeiQI2HyuT6ZcayuH0llfeIGJTHASv07xZoZ1xVF3VjFztg5NfOefr8oVXO/QrIIlM9u8sinsuwdDUHjZ1y8wxyQmurQqzmVaJjQU2xYZZccYk+1jJehnZ9tJptM+nSWOWJNed/36obgwej3edw50fxEF/4+0ms34/PxAliQaHtL2aR8r1tdOOV78pisrJxEwoTyPqYosRDkJFLZsMPcVbSGk3IAryqTcXahFac7w5INtQDh99qoMnrusCK3fXC+heax9UKQ3/zpffxQ1wt1GychxgXdTjT6fmdMyBVQScr40UQcn7ibnbokFa2s6PJUnZiP8cm272Csuxz18gVgF3gjrkMj3bz90D5cdrqpirgvWbe9N5f9F2p/tBbw/7lqRBjRdinVFp9f4BKJbpbkcCF79GVjZ4xO7lp4l8/cQaxAuKqr1iQLQGFZG7xkqlkQqiQbc/j4i+eQiv/BmWpz38/j/MpjNHLsl95xcHrUVIwdzK54msEBXC9i1WUClGNPF+TFCcb7lPwrY9WfAYLnij/7BjuS6vFGZ7UJ+plFsz3J+BSXNfuG2PVLrGcWGPiIowtf4uSWMBU62SoTrUsPAWGxpHKNgfoaHA1SC81GBpHbkW/grxBQlUAjw9OFAaC7BLDlHDqitNX2FfeRHKelOSrr+GYFvmImpGMjdLKmY477fk+ksH8fggZ3kw7wcLopCKSniI+EAsMZD2j9Xfd8nvK/6B3QKxSZJm+IE5H8yJ6jBtNKASH1BHWhVJ3QMtHY1lPKdNd19r4E/WD1ZutyfN6OkwAA==|920
\ No newline at end of file
diff --git a/Pages/收益/生成结算申请单.rd b/Pages/收益/生成结算申请单.rd
new file mode 100644
index 00000000..aa776593
--- /dev/null
+++ b/Pages/收益/生成结算申请单.rd
@@ -0,0 +1,19 @@
+{
+ "PageType": 0,
+ "ColumnCount": 36,
+ "RowCount": 7,
+ "CustomNames": [
+ {
+ "Name": "总金额",
+ "Formula": "生成结算申请单!$AD$2"
+ },
+ {
+ "Name": "开始日期",
+ "Formula": "生成结算申请单!$B$7"
+ },
+ {
+ "Name": "结束日期",
+ "Formula": "生成结算申请单!$E$7"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json
index c4420269..09e15633 100644
--- a/Pages/项目/项目首页/项目标题.json
+++ b/Pages/项目/项目首页/项目标题.json
@@ -49,7 +49,7 @@
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 17.0
+ "DesignLengthInPixel": 22.0
}
},
"2": {
@@ -152,8 +152,8 @@
"LoadBindingDataOption": 2
}
],
- "ImagePath": "Arrow/291_left_arrow_2.svg",
- "BuiltIn": true,
+ "Size": 30,
+ "ImagePath": "返回.svg",
"UseCellForeColor": true
}
},
@@ -164,6 +164,7 @@
"GUID": "c2ee3256-3788-477f-a274-7b848bdd57df",
"IsImagePath": true
},
+ "CssName": "img-cover",
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"TemplateKey": "中圆角",
@@ -239,7 +240,7 @@
]
}
],
- "ID": "6272a6b6-97f0-4fb4-9572-670b59a49878"
+ "ID": "038dcd9a-af42-4004-baa7-a5a10aeefd00"
}
]
}
@@ -366,7 +367,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "d70a6129-40e9-41dd-9d16-b171115f1467"
+ "ID": "55e5097b-d76c-4d84-8b87-bd6dd2dc3f3d"
},
{
"Condition": {
@@ -388,7 +389,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "81729a03-1bf0-414f-8301-5c9571dcfa65"
+ "ID": "a7c6591c-9c1f-4c2c-9278-6b2ba6b49162"
},
{
"Condition": {
@@ -437,7 +438,7 @@
"Disabled": true
}
],
- "ID": "a6ef618e-ca99-4eda-98da-9a86f6c605a4"
+ "ID": "19b12dae-267f-4fb1-8676-25da484f580d"
},
{
"Condition": {
@@ -473,7 +474,7 @@
"Message": "操作完成"
}
],
- "ID": "c21df4e3-b785-4211-a6ba-dc439970408b"
+ "ID": "c6721d0d-3764-466a-b4c7-55266ac69925"
},
{
"Condition": {
@@ -569,12 +570,12 @@
"IsOpenInNewTab": true
}
],
- "ID": "ab99a453-a6f9-412c-9d13-5c5a1e9b5745"
+ "ID": "39b9f3d0-b2be-4660-9dcb-59e24c8178fe"
}
]
}
],
- "ID": "60e7c4a8-b385-4d55-be3b-7bdd07a9064d"
+ "ID": "51a322dc-eea5-40c7-8ca6-769fa3b7c65c"
},
{
"CommandList": [
@@ -584,12 +585,12 @@
"Message": "当前项目未开启收集需求功能，请开启后分享！"
}
],
- "ID": "2b51f984-1821-43b0-bb99-1697580fa6fe"
+ "ID": "232d4e10-a871-407c-a235-8c3025091304"
}
]
}
],
- "ID": "2254f9d1-47f4-4200-bf75-6393bb4178f3"
+ "ID": "c4a58538-9959-4b46-bc3c-16264855d4e1"
},
{
"Condition": {
@@ -622,12 +623,12 @@
"LoadBindingDataOption": 2
}
],
- "ID": "289817e0-ee15-452f-908a-6f27bd3f2943"
+ "ID": "8c7a18bd-8335-4a1a-928c-73fa4a095ce9"
}
]
}
],
- "ID": "b8803009-3a1c-45bf-8d4f-1bfa28c2da4d"
+ "ID": "fd99dd93-ef21-4ed7-9d2a-73eb06679394"
}
]
}
@@ -701,7 +702,7 @@
]
}
],
- "ID": "f71550c9-e8b0-4516-b460-79908df6c7e7"
+ "ID": "db73152b-7de7-410c-b37a-ed06c3651d66"
}
]
}
@@ -947,4 +948,4 @@
"Formula": "项目标题!$F$2"
}
]
-}//rlfCsqB/yM2WHG2Qg0zTWIp0+PwMryc6KoV0+D/SfKyq/0Yq78eGtPMF1n3eOw5GchE7NcUHaJC7v00sat6l9OdTRUOydHDM7yqt/RL6ieJyKWT076jn01lWkywxmpPMETNYpiDU3EbT1y9DXQXygpm+L+0J8BLBeA2jDABADH9mpkmBJghL1N/Z5dorM5RkVs62/Tfg1lCPuH5BNLD5mbTiHwfT/VhM4ESy4Gi7oJaBwK/yw5BEl1aKRajVus5lKNaoxGUAkDen+MH+5PAoBmizVK4giTTwDdUuqri+KnnFO83pAmPPcDqJb1zJm4XsnGXnxAA+8ihknuwwtEsE0dE0EKyp98zurhOFOHx6XBhAegL+kzXFa9ue+p4a3XY3F5jCaB/jKHb95ccqoK/LoCDjIB+7D0Of6wS0p0/D1wSBCBFY763Huwdg8PJ3Pr4YEQIAdnaijKjhNM3Uf412QU0XcdngpeZvUt/+2rcKaWVkeseczWt5Fssu28/MoCE3h6en74FrjrgkUx96blzBGEOgCpG95REb1tyw+P1vrVc5KROKz830kVAE15iU9Ht7bb2OfFuuCfF4wX6/5humA5VB8vOgnbdhANJwzielLQqh3c24XPmV0ZP/+o5hlGGwOKWcAFxdmeUwfTgrtAS+cuJ0/W43Mcri38Wm4RE+2w8YiU++YCzGBsMofPq8ilH3rmTWTiMiAgSwEBm4l5xfIOKBe/SvANgy60Rdr1xzy+qMC9LvT7Vjcf5GAs2eYBg+gDFiTgKZD2oFujl2COl+yjqoVAahqG9lraYuViTEr/hBfK0Uz02uEAw3pPSmVMoA8I/CKS67KAidPZA97lYCeQ/6jft3NGaPa4mt3qpMLJ/rts8qTFnh0FtEYCxlATV5VnGBJ9sEhnYdagKw/kIYqw==|920
\ No newline at end of file
+}//k9H51fc9SHSahncuk/8RESM/bgvn4wbgSXtUTRitWfIagLONLf6iE4XEvd44fSRVYeSR0iq7CQCbEIAQP0IVQxh33nyjWIZIJsLFnAfX299SUgphWoya0S6rDptc0GGx77Yg35P2KdFPTwQPYi5iCM0mej16kNyEq+8Jm8osxhTdguVqlm/fbiDd0Ab4w3KPFNX8M5JoUmP3SR5hi6KlrpQJIFBDMBbKTwYMYaB56gD+aGsnP+Pnqjw8oMw2TFEBviT4pDbXtKaHm/EpAh8EUtzqOKKIJN1IBrBtD/83Ka4rDD+Ec4yUEf0Xvu5ihwkVi3oeM28q1OTqih1fpyCtZTGNCFsSuiL+XTYGEUMJ08KGKUL+2EQuGs8nViVoxzOmdjFjlFQnASi/JduP4AGktKNKZTBJHPK/12apCjDeuymwIxuWZWQEVYW/BRGE13YZFf5TZdIF8+5mBSGvDqUmdXHyTJ0ZKzKTK4z7S5n8ynOcT7YzUkKSOMT4soW1o7idl8sVRxJ19ADoibbFgOJrVrKlIV1aW8A9HjKY6BlI9NNXjT0dsd0ThSiVSvpdhzLc6aPofZUf4ltk6fvGPxREJV1JahScRqy8G+EFgBME9ZAZLCQVjE11nB8phm5i3pJzsYMh8LEYMktwtxkYpNsa+dLOo1PeZZ9TAJxXgh4/UrJVZSpuEtF1KOJpdDoavXuw9dhNHMw97P8886gKKCjBZpqflcyo41Hd8CGBPYFhRIrFQr8Yfs+e70OPvaCjqqbqZe1UE7rXFsxonEqyeNz+flagXu1o/yE61wZIG8mbfz+UM1fOSEUTnr1fGJFDo5ZxuLivdRvaLloQ9b1KqtT7o6vbQ2dBrHe2ckwbczxLVGzOJjJFhBFyaZbxfOtMxLUhZ2zdtmEKQhcLU8uawgpzEQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json
index 82728de8..3ebb6bf9 100644
--- a/Pages/项目/项目首页/项目配置/项目信息.json
+++ b/Pages/项目/项目首页/项目配置/项目信息.json
@@ -317,10 +317,7 @@
"$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
"Caption": "打开客户反馈通道",
"Style": 1
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"1,18": {
"CellType": {
@@ -351,7 +348,7 @@
"BtnText": "知道了"
}
],
- "ID": "9acb2451-ae48-4800-b6c6-fa9e60fd3866"
+ "ID": "6e08b47d-3d9a-4d09-8b36-7484c84616bc"
},
{
"CommandList": [
@@ -575,7 +572,7 @@
"ReloadData": true
}
],
- "ID": "b7b29ea8-b6e6-481f-b2c2-84f463b41b48"
+ "ID": "3df720c2-10c5-4c3a-90fd-2b010b72b4af"
},
{
"CommandList": [
@@ -590,12 +587,12 @@
"BtnText": "知道了"
}
],
- "ID": "613913a3-9063-4ff0-9357-3a228a9f6cec"
+ "ID": "9b5332c9-6aaf-4a2e-94b3-aa250008c585"
}
]
}
],
- "ID": "9c6a3c26-4f07-4a70-84dc-a39f64bd25e2"
+ "ID": "0c2ae451-e8bd-4e25-b410-bdfe0b947fc8"
}
]
}
@@ -618,10 +615,7 @@
"AllowExtensions": ".png, .jpeg, .jpg, .bmp, .gif, .ico"
},
"ImagePath": "app-logo.png"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"4,6": {
"BindingInfo": {
@@ -660,10 +654,7 @@
"FirstParamValue": "1",
"SecondParamValue": "24",
"IgnoreBlank": false
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"4,16": {
"BindingInfo": {
@@ -702,10 +693,7 @@
"NumberType": 6,
"CompareParamType": 5,
"FirstParamValue": "12"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"7,6": {
"BindingInfo": {
@@ -738,10 +726,7 @@
],
"type": "textarea",
"resize": "none"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"9,1": {
"CellType": {
@@ -811,7 +796,7 @@
"Message": "图片生成耗时较久，将在后台生成，请稍后查看！"
}
],
- "ID": "a0612fa2-5a1c-4025-aff4-1b542dbca5d3"
+ "ID": "85c30b39-37cc-4a73-9634-cdeab6872fb4"
},
{
"CommandList": [
@@ -821,7 +806,7 @@
"Message": "请填写项目名称和项目简介"
}
],
- "ID": "28f0a7f7-984c-42b7-b30e-00db30963358"
+ "ID": "36df7a20-c9fc-4cca-8486-a709c23fad80"
}
]
}
@@ -909,10 +894,7 @@
"firstDayOfWeek": 1,
"clearable": true,
"DefautWeekFormat": "yyyy 第 WW 周"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"12,15": {
"BindingInfo": {
@@ -943,10 +925,7 @@
"placeholder": "请选择项目周期",
"controls": false,
"IsDisabled": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"14,12": {
"CellType": {
@@ -983,7 +962,7 @@
"MethodName": "ReloadBindingItems"
}
],
- "ID": "2770a5d5-c7bb-43c7-87a8-bf04ef670e78"
+ "ID": "ef31c5df-06c6-4c8e-aef1-72ea6009155e"
}
]
}
@@ -999,10 +978,7 @@
"Text": "添加",
"ClickMode": 1,
"TemplateKey": "_RS_Main"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"15,1": {
"BindingInfo": {
@@ -1084,10 +1060,7 @@
},
"noMatchText": "无匹配数据",
"clearable": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"15,15": {
"BindingInfo": {
@@ -1191,7 +1164,7 @@
]
}
],
- "ID": "fa299c45-97ed-4842-957d-0d911a4a5a0a"
+ "ID": "383d3c33-cc46-4097-9ecc-a492399ca699"
}
]
}
@@ -1279,10 +1252,7 @@
},
"noMatchText": "无匹配数据",
"clearable": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"17,19": {
"CellType": {
@@ -1313,10 +1283,7 @@
"Text": "添加",
"ClickMode": 1,
"TemplateKey": "_RS_Main"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"18,1": {
"BindingInfo": {
@@ -1399,10 +1366,7 @@
},
"DataValidationInfo": {
"IgnoreBlank": false
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"18,8": {
"CellType": {
@@ -1440,10 +1404,7 @@
"loadingText": "加载中"
},
"noMatchText": "无匹配数据"
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"18,15": {
"BindingInfo": {
@@ -1527,10 +1488,7 @@
"allowCreate": true,
"noMatchText": "无匹配数据",
"clearable": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"20,6": {
"CellType": {
@@ -1672,8 +1630,7 @@
"ErrorMessage": "开启严格模式下，预算工时必须大于0"
},
"RulesGuidList": [
- "80882aaf-77a4-42c8-a371-0d9c66111d9c",
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
+ "80882aaf-77a4-42c8-a371-0d9c66111d9c"
]
},
"21,8": {
@@ -1716,8 +1673,7 @@
"ErrorMessage": "开启严格模式下，预算工时必须大于0"
},
"RulesGuidList": [
- "c6a3b850-e670-401e-87fc-553622e7d5ec",
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
+ "c6a3b850-e670-401e-87fc-553622e7d5ec"
]
},
"21,15": {
@@ -1731,10 +1687,7 @@
"Caption": " 开启严格模式",
"Style": 2,
"CommandList": []
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"24,1": {
"BindingInfo": {
@@ -1768,8 +1721,7 @@
"InputMessage": "分配到人：提前给每个人划分该任务总可用工时\r\n分配到天：提前给成员按天分配每日可用工时\r\n分配到任务：无需分配，所有成员共用任务计划工时"
},
"RulesGuidList": [
- "20ab66f4-8f42-4a32-a499-e96087c93406",
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
+ "20ab66f4-8f42-4a32-a499-e96087c93406"
]
},
"24,18": {
@@ -1831,10 +1783,7 @@
"KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)",
"LayoutMode": 4,
"IsSmallButtonMode": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"30,1": {
"BindingInfo": {
@@ -1869,10 +1818,7 @@
"KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)",
"LayoutMode": 4,
"IsSmallButtonMode": true
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"33,1": {
"BindingInfo": {
@@ -1885,10 +1831,7 @@
"TemplateKey": "_RS_NewLittleRoundCorner",
"WaterMark": "请输入内容",
"CommandList": []
- },
- "RulesGuidList": [
- "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8"
- ]
+ }
},
"35,1": {
"BindingInfo": {
@@ -2516,22 +2459,6 @@
"IsDisabled": true,
"IsInvisible": false,
"IsReadOnly": true
- },
- {
- "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
- "Formula": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息!当前用户<>项目信息!$B$19"
- },
- "Priority": 5,
- "GUID": "03c9c666-9f0e-48b7-b90f-a4e745c3d4f8",
- "StyleInfo": {
- "Underline": null,
- "Strikethrough": null
- },
- "IsDisabled": true,
- "IsInvisible": false,
- "IsReadOnly": false
}
]
}
@@ -2550,4 +2477,4 @@
"Formula": "项目信息!$M$36"
}
]
-}//5Tf3meDuzephwE8+K14oIR0zQ/H6vqROkX4uwdlTcJ4tJAvgpofAf0LJXHCFqC0g6l224vw1HclswZB03TDLgHNdRzcG9o1vy1eZ5faKeEdh3Rjou2gbxeTAUpFXDzsYeqUSNorhi5/FkUPRYgIEXNwlXdcCv/Mh85pL35kxKqwY9FRQPJp50xRuy/JAbgsGyEoJCUUJ76JyD4YoPxJifZO0md3i+SahfkmLunfTqs9t0ZpkEOhvBbVIRE5G4tsfMrQKy5rN4W0sqDX/s9ilKUWVlSDpb03UvbAlr5cz5OKd+FeRnojBlty6KYbUFfUwtZG2WNfbS8fXNNkonvnvXJeZDM4oX2CyJ9fi6wOZT1ChhWVyOw/+16HGNVai2KBObIBNkXTKxdk39FSVreOesfJR1jLdtQGGcVLdWREZgWtlwhqphzp+W+GD5H/jMXfoRvN2gqc58JEFTCSIp+9mZyO7vWnG4Im542z5Tzs8Yw9trzE99x8xi1hPNfdjdWQXTy8ROIguBJ3t6VQLBbeJdDV9/LcmdV6qgssMrQ3s5Dcqoov/AkVmv9jDURypUtjXVgKQgRRzt/EWWo+BWdv+NsTkWvxvjuUsac+hiXouCmVtgkL4SlVhLmbvLX+YCBOGyJLYyHUuC0RfCfJrbJU85jDWcSSUyw3fCZ1ESj0BeQUfUqHLTIy8qy3QvupTED0k31gYkHCJa9/NVvsygkwq/wrRAcapeKGszbe7aklT44RX+sdqXRRBcBM06PBl4+2B80d1R5sApIXKYbmTGecm0yilRfk1LOknz1Ygnvi9hUXvqufM9IiTRn0cpqvrzzxsmIeIFqkoRm0z6g19l4KLJYUnIpltnhTiDCpJvnsvrJ50JO9ca8gCqBwJROVQpYnWpPIYixP1zUQaoGK0Zq++8w==|920
\ No newline at end of file
+}//sg+yV7FNlVixpcJf3I/AXUAgStuOPOqI3hNDC7vtxCF0x55bPQ/gqo5r7ctBVOLJ7la74VX2R3jJjGcxHWEgXC9Yz6om4cOUHxaWXoDrfaBqhWAkl+yuPxKcuROawudddBYQxfx7QaRDk0ihNY4m3RAd+qyasbobryvrMri6en++TWZAlfJV9CjGj9HprIcGFw+L1cMhhyycdaIQFBF9+Ubzd8+8TCTVCODuIlCxeFJzcKxhgez2nGb1XkYcnaGKY5sXzvl0J8VjhWywkQ9E6lRtPvbpb/YP73v6wjdbRMtFEYfJMKBthFBQRt7ZRHCu1bQ83Z9AzuyjGUPP6Ju7LhSXOPPU682Q+l4yt+rj7aL4vIJwc+GuEL/bcOeqt1GUrT47ebbFbLBdQHqVz0C2XKG2LoJEX3teD0fce5afOeb/+II2TJPjmWFmcA/J/Eew6G1KqsgviTOn8fPo9Gpfr9/2ceBDhjOxLs1PEwchroKkdzm3qLLZrZTFzdhm8+BDXZ523a0PHKLkVPOX7ETisXgdJDiXHYx444Em281De52Swv1M0LmCxfFWZ/J6RuW9rbEGPwQRjZVV1oL2io7xmaqSgNnPsqW/lGhSnNiu4UswD/eHiXgv+m7lr39aDyWVxnhyT0SDafV55CO65OUiNnEQj/ZVaBbQypjEh5b39b50Rz2sdiwEAOeVxdDBOFmBH7diqm/JKAOvfbGlmwezcJEKgXuX2G+jW6TfgamYV7huSSGnieRbIO2drqubnO9ks04IlYNl2YCGI1qHu3COy5bsZM/L8ksLnRNWZLtGjU+bM1fqT7Ov0LcRUSBh4/lPHnPTV8LmKrU4/GBtp0pJbroh1XDqKDlbmMwF8tNhVGkKonSPXYFE0jVOAFqfryYD+fA9L+hS5oZvOtivpIp53w==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json
index 8843217e..0c7ea254 100644
--- a/Pages/项目/项目首页/项目首页.json
+++ b/Pages/项目/项目首页/项目首页.json
@@ -347,7 +347,7 @@
"Title": "加载中"
}
],
- "ID": "893b393b-812b-487c-8509-f6bc13d3caa0"
+ "ID": "74a72b30-4b68-46cc-a166-2c0c71479218"
}
]
}
@@ -433,7 +433,7 @@
"ID": "9b783f6a83594474bd58c4a4ea74efe0"
}
],
- "ID": "d545a4f8-6fac-4531-9760-e6e33fa66474"
+ "ID": "166fc53f-fead-4557-94b4-49516ba2d153"
}
]
}
@@ -551,75 +551,6 @@
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
"MasterPageName": "FGC_母版页",
"PageLoadedCommandList": [
- {
- "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "FunctionName": "remove",
- "Title": "加载中"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "ProjectTag",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"\")"
- },
- "ID": "1ee5ad95578c4433b39e83dbf53c919e"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=ProjectTag"
- }
- ]
- },
- "value": "%Null%",
- "compareType": 1
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目首页!项目子页面"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目首页!ProjectTag"
- }
- }
- ]
- }
- ],
- "ID": "507242fd-5761-4926-b28b-6d204b7c9461"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目首页!项目子页面"
- },
- "Value": "任务列表"
- }
- ]
- }
- ],
- "ID": "30ffbcce-36a0-4885-b516-4bd58ac38c63"
- }
- ]
- },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -663,6 +594,11 @@
"value": "%Null%"
},
"CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ },
{
"$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
"PageName": "FGC_维护中",
@@ -682,7 +618,7 @@
]
}
],
- "ID": "e8689fc2-2353-4874-bd34-f38116ab66d4"
+ "ID": "544f2e11-49e9-4b90-9318-e2f3613bad58"
},
{
"CommandList": [
@@ -702,14 +638,88 @@
}
}
],
- "ID": "3eb179f8-253f-4b22-aef2-74220c567316"
+ "ID": "1c9f528b-cc74-4dde-9354-cd8849ab61bc"
}
]
}
],
- "ID": "573cbad1-785d-4a66-aace-57a4524e604d"
+ "ID": "9881644f-d356-4daf-9a02-98a44d055f3e"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "ProjectTag",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"\")"
+ },
+ "ID": "0bfe252c9d4447c0abcc589977d9514c"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=ProjectTag"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目首页!项目子页面"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目首页!ProjectTag"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "6087be2c-e2ba-4bf4-b891-3f7bce4d1017"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目首页!项目子页面"
+ },
+ "Value": "任务列表"
+ }
+ ]
+ }
+ ],
+ "ID": "cc6b3651-ccc0-48a2-aef4-971c6b65fdb1"
+ }
+ ]
+ }
+ ],
+ "ID": "22cae634-2686-4773-b201-7b61e2693b2a"
}
]
+ },
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
}
],
"PermissionData": {
@@ -747,4 +757,4 @@
"Formula": "项目首页!$I$3"
}
]
-}//iVg1qig+QsSmn2gcyGmDRvkUabyOhlxvhPomzfh9JATyhcE83g+6U3DtKIMCkaQxIfyVlP2cScHU7im7TFSxXzk4h2SaUcOQfb5dSaf6kfcMCvmuLjyelnjFBgnHI8RXZHfZ8pofaKR4KARqrn7fwM1DrB7x8DvNGtReQRFLeiQRhBVD3YKSwGKN5rJzai9UKtAO7EyGdfdc0OoFt/yQ/ajuZumKxPe++fmg4ihtcGcnWHXEXLy6KUSKE7HcWD1LNV3tjM99BFmyXN5bAkLnQN3yztUaJUr1pOgTQtk7vNQRzlSR+H6h690efLxNr/2Dxhza3PyYC/vOOaZOl/z7kqKBdnvt2UgiIGQjazDg1zG/MeOdxSY+H3xj0+6+bJ76j88ksQQhYkV3NV/c4H+E7rRHc26QtNZZdR1t+D3y4d28LFGbGV4T96IXk+K48PDZWI70fxOovkBu3QFjiYKec2nngID2YtKbUsKtKnz8ul0wGvS3t88hbrbZR72WPkBZbhIzgRPpGrwgGyA2mTLE7KF3EVmthm0PrnsrJQkIYUEm0S+rMs36vHf1sqP9c7nS9fWbCGKXRK8xTtHxvHq/EwFot210GG3VltLoB/B650UY61YhhQs/voLrdwqOw52EkHgI0EVWQHVrtRWqQGkWk7S49l+mMRd8f0Pd0w7QpFUUnYRWQv0vdIzZhdumAUjslE28i0a/85e4pXQHtNp8yTteuiogYidAA2WolWLidCUz6DisNw+t9e0AvN2PiOh2/PiZimFtsfggWnjmB3deL5rRlhSWUKAeCyQkob/SDFBUsv0nOtV71C7urEyVPgTrW9/n+chQC7cBOysysoZo2cFqKb2a/8ur8c8HzoaPA5ERg2TcYJG6Hg5LygdVKAPGtSuI2ZfjUSLCeUgYRiZ4Pw==|920
\ No newline at end of file
+}//7KOWZ1+Po2e61qYt7r3t/KQP+Vy/b0nhVadgOeGM9Dioo1Befbjx9NXCyu19XJ4e5Lf1GLPRrq3X5Oot9KXgtwiTgHoY/7vTUnfsTlKwvwoZllYxnCI4uU+zpuLGMGtMPPxeiQ66DJLmgYj5SzkDozX/NcAGfM/CWsM6dajoPg5AjsBhZLdigoPHCABVjJQGWnHRNvKxdAIElqgQ03pN99lt3chsMZdbJ2kQI/wGD5j5dtaGc9gK5QnbV+UI1rP1b9NHs3e6L90I1Zm2bOco+n2cP/nQfJZ2D6CUDFWvZEVj9kB4MUzGeSrBllNPY61r0eus9dwLD0sy1RPfmtsA10uELX0cqiAQ6RHfK3cMfFWSxBJuS762qtpCTpjTi8aOTusZ6T/RnlrfKpxQ+O2vPlLVbVZileuFwH0Wn/DuASY9zu/wMF6ucpc8gA5D5AYkBdvC6eW+rxZI8uy/nwU6DGTiwbnvOVVZiWLT7jB+FbCj/JX8/mXfnp0YI+ZKCosX4haOimJCiEsppK0CLKtrj5y+2DqYcSP0eZBv+95wLaZy/SNT5dpTLs6BmdpqmSGVXb6/DMeqyjrajzu41mN0HvyAERE8oz6aCgZVWmV7pu51t/itpc0mtcKMpRF3zBpht+XAszQE92YpRqmTkVJ0K4/GmSzQCv4qne8GhgQQpLPGNHdWoV6tX7I4VoVw0y1xOcUQEoHs0Xi2B/kY8P+FHsXrD6yyOKT2c7laf8roRSPo3/upBpmjfeYJgmudN8XDxWq047BihINxT6xRfCw/lvalJqFEGPXFtRpTzD6UjGI6rFR4LGWhlaJAMXi5k/0YhsGvvfavcNTqg2+xq61LClzhZbK3iAZKTzzFdP6mXCRi+QJ9ZW/ASSFgtPb2KdWMHL5RLgS1lzNYKqKGrq9TDg==|920
\ No newline at end of file
diff --git a/Process/结算申请.bpmn b/Process/结算申请.bpmn
index 9c8e5bf9..ee47ffa2 100644
--- a/Process/结算申请.bpmn
+++ b/Process/结算申请.bpmn
@@ -4,7 +4,7 @@
-
+
@@ -12,19 +12,18 @@
_4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f
-
+
-
+
_4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f
- _9fac5c71-636e-41e6-915a-49a1e7b67072
- Flow_1fmecpw
+ Flow_1vb2401
-
+
- _9fac5c71-636e-41e6-915a-49a1e7b67072
+ Flow_1vb2401
_8c854f9d-40d8-4aed-acb1-6778e09b2e08
@@ -32,7 +31,6 @@
Flow_0c6ycpo
- Flow_1fmecpw
@@ -46,7 +44,7 @@
-
+
_8c854f9d-40d8-4aed-acb1-6778e09b2e08
Flow_0c6ycpo
@@ -56,65 +54,51 @@
-
+
-
-
-
-
- ${sequenceFlowResolver.getConditionResult(execution,'Flow_1fmecpw')}
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json
index 871b0d53..67e7d034 100644
--- a/ServerCommands/工时/分配任务工时.json
+++ b/ServerCommands/工时/分配任务工时.json
@@ -76,7 +76,7 @@
"TableValueType": 1,
"BindingInfos": [
{
- "GUID": "d70fbe4e-6b17-426f-814a-ca333b61e544",
+ "GUID": "136684ee-5394-4682-b812-1b29d38b3420",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "项目ID",
@@ -85,7 +85,7 @@
"ColumnName": "项目ID"
},
{
- "GUID": "3af3de5a-0e95-4e4e-8b88-5acd176de61f",
+ "GUID": "be9d4292-cb11-40d5-b3e1-c303ad79c30f",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务名称",
@@ -94,7 +94,7 @@
"ColumnName": "任务名称"
},
{
- "GUID": "215fef37-f138-47fc-89a8-df8782920810",
+ "GUID": "43c2eef2-5eb0-4255-96df-17ae07a9c3fd",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务状态",
@@ -103,7 +103,7 @@
"ColumnName": "任务状态"
},
{
- "GUID": "83d114d4-8d25-4d00-8d8f-7aa1d22fba08",
+ "GUID": "dddbffb0-3233-4b2d-96be-cb774747ecc9",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务状态",
@@ -117,7 +117,7 @@
"ColumnName": "任务状态文本"
},
{
- "GUID": "4a5b48e7-bb1f-4726-8e21-ceaaa11f2022",
+ "GUID": "a1843f4c-9646-472e-9576-89ddbcf172ab",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "项目ID",
@@ -131,7 +131,7 @@
"ColumnName": "严格模式"
},
{
- "GUID": "2a8af634-7280-46a3-8f3a-f1837b6401e5",
+ "GUID": "c0244cf1-8b1e-454f-800b-4bb38eadee25",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务类型",
@@ -145,7 +145,7 @@
"ColumnName": "提成系数"
},
{
- "GUID": "3c6b7687-5711-448e-b490-9aabb156e498",
+ "GUID": "9d72b79e-ff35-4351-98e2-12ced45e989a",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "项目ID",
@@ -159,7 +159,7 @@
"ColumnName": "工时分配方式"
},
{
- "GUID": "f7fbe8b6-9f82-43b5-8ec8-52205a2152f9",
+ "GUID": "b5130014-cef4-4b45-b66c-95b040c23157",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "开始时间",
@@ -168,7 +168,7 @@
"ColumnName": "开始时间"
},
{
- "GUID": "3bb8328a-b934-488d-a1bd-805072bf2328",
+ "GUID": "d85138a4-04d9-425e-9492-5fa12b6c7312",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务负责人",
@@ -177,7 +177,7 @@
"ColumnName": "执行者"
},
{
- "GUID": "5adaea42-50c9-4b24-94cf-daa981707cf0",
+ "GUID": "209b24c9-daff-4dad-a9e1-4fb89f674d09",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "可分配工时",
@@ -201,7 +201,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "04187475662c442396affecd4e52794f"
+ "ID": "0a5e439272554e37a96d7a61d8f69050"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -475,7 +475,7 @@
"ParamNameToSaveNewRowValue": ""
}
],
- "ID": "7b5c9507-6fcf-4351-96a0-00134cfc0acd"
+ "ID": "57248cd4-2838-4f18-a187-2040ad1ce0b6"
}
]
},
@@ -530,7 +530,7 @@
"ID": "f1babee3af9a4401b69d66a5728facf3"
}
],
- "ID": "d084fbee-4af1-4e4d-8eaa-6af89e55b775"
+ "ID": "d243eecb-bdef-4cb6-8560-9a34f370378e"
},
{
"Condition": {
@@ -561,10 +561,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=结束日期"
},
- "ID": "d184eff4cba7445a955fa8144ebd3951"
+ "ID": "aaefe8a951624a449e45823a45627c18"
}
],
- "ID": "0b37c3cb-e565-4743-bb74-87d80ddbd9f5"
+ "ID": "ce8b08de-2dc8-4063-a813-84cff33d9a44"
}
],
"Comments": "如果是按人分配，则把计划工时分到一天中"
@@ -700,7 +700,7 @@
"ID": "954da7d900d44d068c49c0775cbb66ad"
}
],
- "ID": "9136d195-6c6d-421a-a38c-82180d48e4eb"
+ "ID": "6c34f9eb-9039-4cdd-8bcd-caeafe3003d5"
},
{
"CommandList": [
@@ -714,7 +714,7 @@
"ID": "bd03cd955f4449cf9d84c422471b58ac"
}
],
- "ID": "1f4284c0-335b-4330-9c39-0620a677e8fe"
+ "ID": "fa2e70eb-89ff-442e-b63d-7acc531ba781"
}
]
},
@@ -795,7 +795,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
- "GUID": "ca5a3d90-f76a-4612-a67a-7c2bf36c3aa6"
+ "GUID": "62276f79-9b5c-4d2c-9ee7-1b22def93d88"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -806,7 +806,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "019b582a-4594-409d-b829-edf35f98b6e4"
+ "GUID": "78890980-32ba-437b-b818-5dacd60eaeb6"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -817,7 +817,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "f22bd597-15b2-4d6d-97d9-e170e3aa5b0b"
+ "GUID": "77dbe469-acdf-4403-92cc-8f4df2d07741"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -828,7 +828,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "91caa3f1-8ae3-4f93-88ae-9fca29adafc1"
+ "GUID": "156b1aa9-00d0-4014-88dc-1de5bcdfa094"
},
"Value": "计划"
},
@@ -836,7 +836,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "c578c59d-5fa9-4424-8c61-f1230195ea85"
+ "GUID": "531143cf-d38d-4c86-8c93-9f9a97aa2d4e"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -847,7 +847,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
- "GUID": "98b6d94b-9796-4c91-8ca4-4245ff59587b"
+ "GUID": "8a60f2dd-d8c3-4de6-b836-f24daa94d0f7"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -858,7 +858,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
- "GUID": "a6b55b11-0242-4631-8bcf-7922ab6bce46"
+ "GUID": "c14458b5-3e48-4525-bb12-fa7a103746cf"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -869,7 +869,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪单价",
- "GUID": "9635331d-aeae-43e3-a89b-c34570f6058c"
+ "GUID": "dfa43bea-2db8-4347-81b3-682ffe372a30"
},
"Value": "0"
},
@@ -877,7 +877,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "提成系数",
- "GUID": "f2cee9cd-2d00-40d0-970b-c94c90ea9415"
+ "GUID": "bc4394e7-3142-4cb6-8b31-422223365a39"
},
"Value": "0"
},
@@ -885,7 +885,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪来源",
- "GUID": "e53d2e82-3206-4faa-8aec-b464aa95a62b"
+ "GUID": "cd8474fe-29cd-4885-9ab9-06b3c1954441"
}
}
]
@@ -900,7 +900,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目ID",
- "GUID": "db36359f-e763-408e-a6ea-83c3e530edb1"
+ "GUID": "a584d5c3-214e-446e-b71f-e9ddaa1e076a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -911,7 +911,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目动态",
- "GUID": "ee984db3-7339-4498-aa0a-e0f891fe3888"
+ "GUID": "99164e45-4b55-4277-ac9d-d27926533639"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -922,7 +922,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "执行人",
- "GUID": "34733e1c-c4d9-4f27-8669-097ae7ef3e15"
+ "GUID": "8dd8cb7f-ae3f-4c44-a488-6001d3c1df29"
},
"Value": "%CurrentUser%"
}
@@ -932,7 +932,7 @@
}
],
"Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错",
- "ID": "5ee7326c-c558-4870-8c9b-3b901b21182c"
+ "ID": "5bcefe86-54b7-42c9-a36d-9937ae264dd7"
},
{
"CommandList": [
@@ -945,7 +945,7 @@
}
}
],
- "ID": "bd16d028-b73c-491a-b4a8-6d00a6923fec"
+ "ID": "5bafb462-cbc7-4fbd-a9f8-e934a1118945"
}
]
}
@@ -959,7 +959,7 @@
"Message": "分配计划工时成功"
}
],
- "ID": "5fac0eb5-f731-44cc-a018-995976e67698"
+ "ID": "52c76946-b751-42dc-b52d-517bd444faa4"
},
{
"CommandList": [
@@ -972,12 +972,12 @@
}
}
],
- "ID": "892579fc-1bf9-43bc-80d7-6c3b50ea11c3"
+ "ID": "bf83c604-28e7-4994-9167-33ff6931935c"
}
]
}
],
- "ID": "215c9939-b849-4e09-b1c6-dc0d0b7d3c77"
+ "ID": "1f129fa8-f603-46ef-bde1-8ca87368c489"
},
{
"CommandList": [
@@ -987,13 +987,13 @@
"Message": "该用户不是项目成员"
}
],
- "ID": "f1bfbc10-35b8-44c1-b4c9-a8d6965a7f01"
+ "ID": "79e2ea95-deb1-4260-9805-43f190ef789d"
}
],
"Comments": "如果任务成员中没有，则自动加一个"
}
],
- "ID": "bbfe9b03-66df-4e36-9b90-0d6758c44408"
+ "ID": "8f799997-03ea-43ed-8434-a36d3e109de6"
},
{
"CommandList": [
@@ -1003,12 +1003,12 @@
"Message": "您提交的工时超过任务预算工时，请修改后重新提交"
}
],
- "ID": "36775ed1-cd32-4f99-acdf-6b85362b827c"
+ "ID": "e5d63a8d-12d3-4288-842a-238ae431f6c0"
}
]
}
],
- "ID": "dc63381f-0182-438c-bba5-f8470ca29226"
+ "ID": "ec92978b-9d8f-49c2-83ce-6b57b0e83a14"
},
{
"CommandList": [
@@ -1018,7 +1018,7 @@
"Message": "任务不存在"
}
],
- "ID": "76705ade-2b7a-4303-bb61-e297fdf90439"
+ "ID": "0439b829-1a9b-4b3b-b8c7-caa2a070e7d7"
}
]
}
diff --git a/ServerCommands/收益/删除请款单.json b/ServerCommands/收益/删除请款单.json
new file mode 100644
index 00000000..935a8202
--- /dev/null
+++ b/ServerCommands/收益/删除请款单.json
@@ -0,0 +1,233 @@
+{
+ "Name": "删除请款单",
+ "Description": "删除请款单、并重置对应工时记录",
+ "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
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "请款单",
+ "TableValue": {
+ "TableName": "收益请款单表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "e9969098-818e-4750-9f5b-ebdd22d6d6bf",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "流程实例ID",
+ "GUID": "6d1084b0-f563-41c1-961f-0648e641ede7"
+ },
+ "ColumnName": "流程实例ID"
+ },
+ {
+ "GUID": "92196a03-fb15-4f55-b732-cfb0378dbb48",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "状态",
+ "GUID": "8917213e-ecad-4055-bf5c-75b1b1745dee"
+ },
+ "ColumnName": "状态"
+ },
+ {
+ "GUID": "e62b17f8-8bc4-4908-81dd-2bca97df0c05",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "付款凭证ID",
+ "GUID": "a46a758b-1719-4353-847b-60e45db768d5"
+ },
+ "ColumnName": "付款凭证ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "ID",
+ "GUID": "9260f94d-f521-47a6-9a33-cfb4782dfcd8"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ },
+ "TopCount": "1"
+ },
+ "ID": "d91326c4deea4be8817128ba26487d73"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.状态"
+ }
+ },
+ "value": "4",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.付款凭证ID"
+ }
+ },
+ "value": "%Null%"
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务工时表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "请款单ID",
+ "GUID": "7e4fd062-7a6b-4458-ad29-591d64c14167"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "请款单ID",
+ "GUID": "7293b64a-dfba-4f28-9797-1d95b9bfe45f"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "收益请款单表",
+ "UpdateType": "delete",
+ "ShowConfirm": true,
+ "ConfirmText": "您确定要删除吗？",
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "ID",
+ "GUID": "d81b95f7-f049-4617-9f43-edea4d2bf48e"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon",
+ "ProcessInstanceId": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.流程实例ID"
+ },
+ "OperateType": 301
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "请款单已删除"
+ }
+ ],
+ "ID": "11e8fb08-4b26-45f5-8623-b43c4802896f"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请款单未终止或已结款，无法撤销！"
+ }
+ ],
+ "ID": "5c7c5ef7-cffd-4818-8a6f-71bbdfdce2b1"
+ }
+ ]
+ }
+ ],
+ "ID": "8c653230-3bf5-47c9-b5aa-cbd237c820c8"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请款单不存在"
+ }
+ ],
+ "ID": "7bae4efe-28e9-4486-843a-641e63f74419"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/收益/完成请款单.json b/ServerCommands/收益/完成请款单.json
new file mode 100644
index 00000000..89d5599b
--- /dev/null
+++ b/ServerCommands/收益/完成请款单.json
@@ -0,0 +1,413 @@
+{
+ "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": "凭证ID",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+ "TryCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "请款单",
+ "TableValue": {
+ "TableName": "收益请款单表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "d2272aaf-58e0-4d55-8963-45fece689fc9",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款日期",
+ "GUID": "d50b6487-dbac-4f7e-8106-510608c5eb4f"
+ },
+ "ColumnName": "请款日期"
+ },
+ {
+ "GUID": "c3656ddc-6c2b-43bb-ae12-f888135d18b6",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款人",
+ "GUID": "c963a44b-4716-4526-86a6-664edcaf1d89"
+ },
+ "ColumnName": "请款人"
+ },
+ {
+ "GUID": "ff153126-fe90-481c-9817-6c975d97a91b",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "户名",
+ "GUID": "991ef5e9-65de-4f2d-9ed6-9f36b3114c78"
+ },
+ "ColumnName": "户名"
+ },
+ {
+ "GUID": "6fb9779c-14c7-4116-8214-3a1e804e963c",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "帐号",
+ "GUID": "55ee3d92-fe3e-421b-ae51-d7d9293ca85f"
+ },
+ "ColumnName": "帐号"
+ },
+ {
+ "GUID": "d7ca14a3-7393-4402-86de-fc2b096a0a7a",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "开户行",
+ "GUID": "7550ff72-06c5-481f-b9fb-5964e9c368e1"
+ },
+ "ColumnName": "开户行"
+ },
+ {
+ "GUID": "dbdf9b8c-35ab-46cc-8847-6bfa3b3d9b59",
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "备注",
+ "GUID": "ff96cd55-76f8-4675-85ef-039c9069d015"
+ },
+ "ColumnName": "备注"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "ID",
+ "GUID": "0833eff5-5814-40fe-8cff-b73eabd4b1c5"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "80c61dd58b014c51b3c369c8174f911a"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "付款凭证",
+ "TableValue": {
+ "TableName": "付款凭证表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "5c65724e-e2da-497c-b767-c11f00061e8c",
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "经手人",
+ "GUID": "9258aea3-3a38-40c9-ab7b-d2f3a96aa740"
+ },
+ "ColumnName": "经手人"
+ },
+ {
+ "GUID": "27dae5ce-c2b0-440f-b312-1e6ca476f610",
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "付款金额",
+ "GUID": "03f811f5-c42e-45b4-a5cc-259e1bdcaf35"
+ },
+ "ColumnName": "付款金额"
+ },
+ {
+ "GUID": "be42b82a-b1bf-4d0d-a0eb-860b171dcd91",
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "备注",
+ "GUID": "cd3e4264-4ed9-45f5-9243-2353dbfc3e64"
+ },
+ "ColumnName": "备注"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "ID",
+ "GUID": "913ed876-9d88-4547-9ce8-9c5e5850415e"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=凭证ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "0fee1b01db9f4defb3b75d3edc5925ca"
+ },
+ {
+ "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "收益请款单表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "ID",
+ "GUID": "28f0ca89-a70a-40b9-96b6-f0b014b20a5f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "付款凭证ID",
+ "GUID": "3a720a85-05da-441c-9183-1646592475be"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=凭证ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "状态",
+ "GUID": "3674d965-322a-4db7-86f9-4fa8a10f7a56"
+ },
+ "Value": "3"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "付款凭证表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "ID",
+ "GUID": "20193d9f-de70-4675-8748-d8c2ab9c5b98"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=凭证ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "收款人",
+ "GUID": "e2f776ee-a4b3-45f0-a4ec-da7cfdf3aa6b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.请款人"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "户名",
+ "GUID": "60d9a76f-2eaa-4610-b27b-a40a00416407"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.户名"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "卡号",
+ "GUID": "c9ebcde4-c696-4eea-aae8-b9d94e9470f5"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.帐号"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "付款凭证表",
+ "ColumnName": "开户行",
+ "GUID": "7e13b62e-7665-4b06-bb86-b2190eeb999d"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.开户行"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "收益变动记录表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "日期",
+ "GUID": "73395473-1ee0-45f9-924f-5502699fb556"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.请款日期"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "成员",
+ "GUID": "c9246e1b-380b-46df-8bf9-264cb5535e9b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.请款人"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "操作人",
+ "GUID": "ef70c58b-29df-4473-8f49-f000ec7bd11a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=付款凭证.经手人"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "来源",
+ "GUID": "d229b120-a181-4449-8991-3d8a7294a523"
+ },
+ "Value": "收益结算申请"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "来源ID",
+ "GUID": "796b9202-912f-4a71-bda3-50696b3afd1b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "金额",
+ "GUID": "186339c9-f3c5-437b-a06e-576cd146e5ac"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=付款凭证.付款金额"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "备注",
+ "GUID": "36dc6300-e168-4c86-874e-c792b579fdb4"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.备注"
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "结算成功"
+ }
+ ]
+ },
+ "CatchCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "日志表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "日志表",
+ "ColumnName": "标题",
+ "GUID": "01a36f36-7140-4301-a68c-5f0748c19309"
+ },
+ "Value": "完成请款单"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "日志表",
+ "ColumnName": "内容",
+ "GUID": "97ff6b18-02b6-428b-8f10-2ecd3f55e910"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionMessage"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "日志表",
+ "ColumnName": "类型",
+ "GUID": "83eae015-a03e-4327-ba0f-a3d15a4fe734"
+ },
+ "Value": "错误"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/收益/生成请款单.json b/ServerCommands/收益/生成请款单.json
new file mode 100644
index 00000000..60f6689e
--- /dev/null
+++ b/ServerCommands/收益/生成请款单.json
@@ -0,0 +1,314 @@
+{
+ "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": "工时任务ID数组",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "非法工时行数",
+ "TableValue": {
+ "TableName": "任务工时表",
+ "TableValueType": 3,
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 8,
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "0d6f51fb-9eb2-4b1d-ac2c-dc3f2edc0f0b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=工时任务ID数组"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "是否请款",
+ "GUID": "74138321-dcbc-4d9a-b4a1-3ada8c41d214"
+ },
+ "Value": "1"
+ }
+ ]
+ },
+ "NullFormulaValueQueryPolicy": 0
+ },
+ "ID": "4b82b14025984224abd390c269d3f762"
+ },
+ {
+ "$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.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "明细统计",
+ "TableValue": {
+ "TableName": "任务工时表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "a2491042-2ce1-48ff-992c-c00115a515b9",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "行数",
+ "GUID": "ca5a08ac-a4ed-4180-9448-05fda1d81c74"
+ },
+ "ColumnName": "行数"
+ },
+ {
+ "GUID": "a98ae5d4-9431-45d2-b81f-539a58c792f2",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "收益求和",
+ "GUID": "76131ef4-0310-47ef-b95b-8cae1845c009"
+ },
+ "ColumnName": "收益求和"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 8,
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "1183f68f-e95a-4ecd-b874-2dcce7f59d38"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=工时任务ID数组"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "是否请款",
+ "GUID": "eead7ffa-1ca4-4700-a84e-32710d76ebae"
+ },
+ "Value": "0"
+ }
+ ]
+ },
+ "NullFormulaValueQueryPolicy": 0
+ },
+ "ID": "6157ee87b3124e34b569b2553994bd1e"
+ },
+ {
+ "$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",
+ "compareType": 2
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "收益请款单表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款日期",
+ "GUID": "62435986-c8bf-4491-aaf8-ec30e282b42b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=TODAY()"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款人",
+ "GUID": "eafbf4d3-4c74-44eb-83ee-cec98785a0c9"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款人"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款金额",
+ "GUID": "8e6c8fe9-3f92-4e3d-a524-1384df5f04a0"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=明细统计.收益求和"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "状态",
+ "GUID": "01351c77-d2bb-4497-ba13-cf2210e5c0b0"
+ },
+ "Value": "0"
+ }
+ ],
+ "ParamNameToSaveNewRowValue": "请款单"
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务工时表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 8,
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "85f7e8e6-4603-4fc5-83c0-013d6776f3b9"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=工时任务ID数组"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "请款单ID",
+ "GUID": "07397efc-e2da-4a06-a997-087d59191b2d"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.ID"
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "生成完毕",
+ "CustomReturns": [
+ {
+ "ReturnPropertyName": "请款单ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=请款单.ID"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "f0308d1b-eb04-41e1-b249-c21df4cd8c11"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请至少选择一条有效工时收益进行提交",
+ "CustomReturns": [
+ {
+ "ReturnPropertyName": "请款单ID"
+ }
+ ]
+ }
+ ],
+ "ID": "5031410c-0004-4e5a-8aef-f07f4a0648b8"
+ }
+ ]
+ }
+ ],
+ "ID": "e3bbc74f-c709-4562-a69d-664ff78bb0d8"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "所选工时中存在已请款记录，请重新选择！",
+ "CustomReturns": [
+ {
+ "ReturnPropertyName": "请款单ID"
+ }
+ ]
+ }
+ ],
+ "ID": "009cec1f-3b29-4dee-8f67-5ab17413ddd0"
+ }
+ ]
+ }
+ ],
+ "ReturnProperties": [
+ {
+ "Name": "请款单ID"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/收益/绑定工时与请款单.json b/ServerCommands/收益/绑定工时与请款单.json
deleted file mode 100644
index 2c595bb8..00000000
--- a/ServerCommands/收益/绑定工时与请款单.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "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
- }
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "单据",
- "TableValue": {
- "TableName": "收益请款单表",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "863f38ac-72ee-4032-8cde-fc836f298307",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "工时ID数组",
- "GUID": "244ec80e-5831-44d1-8366-df1406ead9ff"
- },
- "ColumnName": "工时ID数组"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "ID",
- "GUID": "aed2d551-3fe7-4d07-88a6-4d935d9792f7"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- },
- "TopCount": "1"
- },
- "ID": "ec9c21ad2fe34592ae97cbf4d94e7e58"
- },
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "任务工时表",
- "ShowConfirm": false,
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
- "CompareType": 8,
- "ColumnBindingInfo": {
- "TableName": "任务工时表",
- "ColumnName": "ID",
- "GUID": "ec5b4589-e045-4cba-8519-4fd44ff5c266"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=单据.工时ID数组"
- }
- },
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "任务工时表",
- "ColumnName": "请款单ID",
- "GUID": "81fdadc9-bb3e-4d66-abaa-d85414a4f5d7"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "同步成功"
- }
- ]
-}
\ No newline at end of file
diff --git a/ServerCommands/收益/绑定结算请款单凭证ID.json b/ServerCommands/收益/绑定结算请款单凭证ID.json
deleted file mode 100644
index ec4d3673..00000000
--- a/ServerCommands/收益/绑定结算请款单凭证ID.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
- "Name": "绑定结算请款单凭证ID",
- "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": "凭证ID",
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "请款单",
- "TableValue": {
- "TableName": "收益请款单表",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "9cdd3c29-a8b5-4b76-aca6-5039f91d79c3",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "请款人",
- "GUID": "c963a44b-4716-4526-86a6-664edcaf1d89"
- },
- "ColumnName": "请款人"
- },
- {
- "GUID": "5060cdaf-0b7b-4ad4-bd63-bb54bb6b997d",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "户名",
- "GUID": "991ef5e9-65de-4f2d-9ed6-9f36b3114c78"
- },
- "ColumnName": "户名"
- },
- {
- "GUID": "568302f5-dcbb-4796-983f-9c483452265e",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "帐号",
- "GUID": "55ee3d92-fe3e-421b-ae51-d7d9293ca85f"
- },
- "ColumnName": "帐号"
- },
- {
- "GUID": "d86f6185-d106-4f94-b158-e350f12e99ec",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "开户行",
- "GUID": "7550ff72-06c5-481f-b9fb-5964e9c368e1"
- },
- "ColumnName": "开户行"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "ID",
- "GUID": "0833eff5-5814-40fe-8cff-b73eabd4b1c5"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- },
- "NullFormulaValueQueryPolicy": 0,
- "TopCount": "1"
- },
- "ID": "7838c90dad534d6cb7ae55f0aa63369b"
- },
- {
- "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "收益请款单表",
- "ShowConfirm": false,
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "ID",
- "GUID": "28f0ca89-a70a-40b9-96b6-f0b014b20a5f"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- },
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "02f3b375-c90d-472d-a961-65e6219c0329"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=凭证ID"
- }
- }
- ]
- },
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "付款凭证表",
- "ShowConfirm": false,
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "ID",
- "GUID": "20193d9f-de70-4675-8748-d8c2ab9c5b98"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=凭证ID"
- }
- },
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "收款人",
- "GUID": "5b52c634-0ea3-49aa-9b30-e9f54f35173a"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.请款人"
- }
- },
- {
- "BindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "户名",
- "GUID": "9b0f90e5-73e6-4197-9809-322082127662"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.户名"
- }
- },
- {
- "BindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "卡号",
- "GUID": "e0aa8a6d-68b5-4a20-9f43-f36f4b65ecf8"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.帐号"
- }
- },
- {
- "BindingInfo": {
- "TableName": "付款凭证表",
- "ColumnName": "开户行",
- "GUID": "d8ab546d-1aba-478b-b830-f030b09c5bad"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.开户行"
- }
- }
- ]
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "绑定成功"
- }
- ]
-}
\ No newline at end of file
diff --git a/ServerCommands/收益/记录收益变动.json b/ServerCommands/收益/记录收益变动.json
deleted file mode 100644
index 3dcc5a58..00000000
--- a/ServerCommands/收益/记录收益变动.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
- "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
- }
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "请款单",
- "TableValue": {
- "TableName": "收益请款单表",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "0bf88997-652d-4c15-be40-29c222307ec9",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "97c9ef6c-ef91-4922-9d3f-8be0f5113b88"
- },
- "ColumnName": "付款凭证ID"
- },
- {
- "GUID": "13c533a1-f4cd-484b-900e-d22f847fde73",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "44892132-df99-4467-aed8-936bf84a67f6",
- "RelationBinding": {
- "RelatedTable": "付款凭证表",
- "RelatedColumn": "ID",
- "DisplayColumn": "付款金额"
- }
- },
- "ColumnName": "付款金额"
- },
- {
- "GUID": "28055312-b930-4bab-810c-78115ae92440",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "fc7a9f5e-f5c9-468a-9cca-4fd51092a65c",
- "RelationBinding": {
- "RelatedTable": "付款凭证表",
- "RelatedColumn": "ID",
- "DisplayColumn": "备注"
- }
- },
- "ColumnName": "备注"
- },
- {
- "GUID": "93867d41-2ab6-48ae-b5cc-25239a5d0e36",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "请款日期",
- "GUID": "a512c59c-4bd5-4553-9740-c859a20ae38c"
- },
- "ColumnName": "请款日期"
- },
- {
- "GUID": "58c35d0e-b585-46c2-bafa-0c269bda9886",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "35fd0f79-a95d-4920-ba1e-6ec049a2672f",
- "RelationBinding": {
- "RelatedTable": "付款凭证表",
- "RelatedColumn": "ID",
- "DisplayColumn": "经手人"
- }
- },
- "ColumnName": "经手人"
- },
- {
- "GUID": "f3b4cd18-158a-431e-b30e-d53b284ea8c4",
- "BindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "付款凭证ID",
- "GUID": "ec24ebd3-e0e7-4d84-8116-86e5fa9dddaf",
- "RelationBinding": {
- "RelatedTable": "付款凭证表",
- "RelatedColumn": "ID",
- "DisplayColumn": "收款人"
- }
- },
- "ColumnName": "收款人"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "收益请款单表",
- "ColumnName": "ID",
- "GUID": "148cb134-07a7-4aa6-adaf-ef6455b003ab"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- },
- "NullFormulaValueQueryPolicy": 0,
- "TopCount": "1"
- },
- "ID": "6c29c26c85e4460199f8d567f529d043"
- },
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "收益变动记录表",
- "UpdateType": "add",
- "ShowConfirm": false,
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "日期",
- "GUID": "f7968c03-b160-4b0d-b3d4-f18d24d8607f"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.请款日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "成员",
- "GUID": "f0630db0-89c5-4e28-8604-d08d2d5ab839"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.收款人"
- }
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "操作人",
- "GUID": "e9d11215-f07e-460f-b974-7a85d4f6c31b"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.经手人"
- }
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "来源",
- "GUID": "e261f745-d04f-4049-bbbd-e36611add773"
- },
- "Value": "收益结算申请"
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "来源ID",
- "GUID": "78e092b2-67bc-4018-b7be-d34a8ee3bf12"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "金额",
- "GUID": "d82a00f6-920f-42f9-b8e9-92ae696cafe9"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.付款金额"
- }
- },
- {
- "BindingInfo": {
- "TableName": "收益变动记录表",
- "ColumnName": "备注",
- "GUID": "9a003cb7-67a0-45da-a3bc-2f73ceefcd01"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=请款单.备注"
- }
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "绑定成功"
- }
- ]
-}
\ No newline at end of file
diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json
index c36abc94..3fa7bd9a 100644
--- a/Tables/工时/任务工时表.json
+++ b/Tables/工时/任务工时表.json
@@ -1,5 +1,215 @@
{
"Name": "任务工时表",
+ "ShowBuiltInFields": true,
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core",
+ "enabledTypes": 2,
+ "isExternal": true,
+ "detailTables": []
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "执行人",
+ "filterType": 4,
+ "condition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "执行人",
+ "GUID": "080ff6d7-1f57-4264-9fc3-578ad59cca9c"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "财务",
+ "商务总监",
+ "项目总监"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "执行人",
+ "filterType": 5
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 1,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "执行人"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core",
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 1,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "上报工时": 5,
+ "任务ID": 5,
+ "工时": 5,
+ "工时日期": 5,
+ "工时类型": 5,
+ "平均时薪": 5,
+ "总工时": 5,
+ "执行人": 5,
+ "执行内容": 5,
+ "提成系数": 5,
+ "时薪单价": 5,
+ "时薪来源": 5,
+ "请款单ID": 5,
+ "项目ID": 5,
+ "预算收益": 5,
+ "是否请款": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "上报工时": 5,
+ "任务ID": 5,
+ "工时": 5,
+ "工时日期": 5,
+ "工时类型": 5,
+ "平均时薪": 5,
+ "总工时": 5,
+ "执行人": 5,
+ "执行内容": 5,
+ "提成系数": 5,
+ "时薪单价": 5,
+ "时薪来源": 5,
+ "请款单ID": 5,
+ "项目ID": 5,
+ "预算收益": 5,
+ "是否请款": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "上报工时": 5,
+ "任务ID": 5,
+ "工时": 5,
+ "工时日期": 5,
+ "工时类型": 5,
+ "平均时薪": 5,
+ "总工时": 5,
+ "执行人": 5,
+ "执行内容": 5,
+ "提成系数": 5,
+ "时薪单价": 5,
+ "时薪来源": 5,
+ "请款单ID": 5,
+ "项目ID": 5,
+ "预算收益": 5,
+ "是否请款": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
"Columns": [
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -115,6 +325,36 @@
"Name": "预算收益",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
+ "Formula": "IF(ISBLANK([请款单ID]),0,1)",
+ "Name": "是否请款",
+ "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "0715a5f1-9996-4ab6-9938-97788f3c0581"
+ },
+ "AggregateFunction": 1,
+ "DataColumnName": "ID",
+ "Name": "行数",
+ "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "预算收益",
+ "GUID": "89bcd620-d57c-4587-a53f-37447e4e2e06"
+ },
+ "AggregateFunction": 4,
+ "DataColumnName": "预算收益",
+ "Name": "收益求和",
+ "ColumnType": "System.Double, 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
index 0d53d109..e20add85 100644
--- a/Tables/收益/收款账户信息表.json
+++ b/Tables/收益/收款账户信息表.json
@@ -1,5 +1,153 @@
{
"Name": "收款账户信息表",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core",
+ "enabledTypes": 2,
+ "isExternal": true,
+ "detailTables": []
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "用户",
+ "filterType": 4,
+ "condition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收款账户信息表",
+ "ColumnName": "用户",
+ "GUID": "79d48ffc-5439-4ccb-9baf-921d9a25857a"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "财务",
+ "商务总监",
+ "项目总监"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core",
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 1,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "收款人": 5,
+ "用户": 5,
+ "账户类型": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "收款人": 5,
+ "用户": 5,
+ "账户类型": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "收款人": 5,
+ "用户": 5,
+ "账户类型": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
"Columns": [
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
diff --git a/Tables/收益/收益变动记录表.json b/Tables/收益/收益变动记录表.json
index dd9d0774..e4a90bda 100644
--- a/Tables/收益/收益变动记录表.json
+++ b/Tables/收益/收益变动记录表.json
@@ -1,5 +1,172 @@
{
"Name": "收益变动记录表",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core",
+ "enabledTypes": 2,
+ "isExternal": true,
+ "detailTables": []
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "Administrator",
+ "财务",
+ "商务总监",
+ "项目总监"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "成员",
+ "filterType": 4,
+ "condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "成员",
+ "GUID": "ec067a35-34f1-493e-8f9f-e2745d0074d3"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "操作人",
+ "GUID": "c56b20e2-3b20-4a1e-868f-2a983a4d78ff"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 6,
+ "ColumnBindingInfo": {
+ "TableName": "收益变动记录表",
+ "ColumnName": "成员",
+ "GUID": "ade64b34-f897-4311-b0ed-30a9d6dc909a",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 8
+ }
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ ],
+ "RelationType": 1
+ }
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core",
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 1,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "成员": 5,
+ "操作人": 5,
+ "日期": 5,
+ "来源": 5,
+ "来源ID": 5,
+ "金额": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "成员": 5,
+ "操作人": 5,
+ "日期": 5,
+ "来源": 5,
+ "来源ID": 5,
+ "金额": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "备注": 5,
+ "成员": 5,
+ "操作人": 5,
+ "日期": 5,
+ "来源": 5,
+ "来源ID": 5,
+ "金额": 5
+ },
+ "subTableOperations": {},
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
"Columns": [
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
diff --git a/Tables/收益/收益请款单表.json b/Tables/收益/收益请款单表.json
index 9abe4389..ecd2556c 100644
--- a/Tables/收益/收益请款单表.json
+++ b/Tables/收益/收益请款单表.json
@@ -1,5 +1,216 @@
{
"Name": "收益请款单表",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core",
+ "enabledTypes": 2,
+ "isExternal": true,
+ "detailTables": [
+ {
+ "subTableName": "View_任务工时统计",
+ "subColumnName": "请款单ID",
+ "relatedColumnName": "ID"
+ },
+ {
+ "subTableName": "任务工时表",
+ "subColumnName": "请款单ID",
+ "relatedColumnName": "ID"
+ },
+ {
+ "subTableName": "收益变动记录表",
+ "subColumnName": "来源ID",
+ "relatedColumnName": "ID"
+ }
+ ]
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "请款人"
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "财务",
+ "商务总监",
+ "项目总监"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "请款人",
+ "filterType": 5
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
+ "operationTypes": 13,
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
+ "userFieldName": "请款人",
+ "filterType": 4,
+ "condition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "收益请款单表",
+ "ColumnName": "请款人",
+ "GUID": "5802daf0-5ac2-43f9-b3d2-010188b59333"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ }
+ },
+ "dataPermissionType": 2,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core",
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 1,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "付款凭证ID": 5,
+ "备注": 5,
+ "工时ID数组": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "总收益": 5,
+ "户名": 5,
+ "明细行数": 5,
+ "流程实例ID": 5,
+ "状态": 5,
+ "请款人": 5,
+ "请款日期": 5
+ },
+ "subTableOperations": {
+ "View_任务工时统计": 5,
+ "任务工时表": 5,
+ "收益变动记录表": 5
+ },
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "Administrator"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "付款凭证ID": 5,
+ "备注": 5,
+ "工时ID数组": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "总收益": 5,
+ "户名": 5,
+ "明细行数": 5,
+ "流程实例ID": 5,
+ "状态": 5,
+ "请款人": 5,
+ "请款日期": 5
+ },
+ "subTableOperations": {
+ "View_任务工时统计": 5,
+ "任务工时表": 5,
+ "收益变动记录表": 5
+ },
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
+ "config": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core",
+ "fieldOperations": {
+ "ID": 1,
+ "付款凭证ID": 5,
+ "备注": 5,
+ "工时ID数组": 5,
+ "帐号": 5,
+ "开户行": 5,
+ "总收益": 5,
+ "户名": 5,
+ "明细行数": 5,
+ "流程实例ID": 5,
+ "状态": 5,
+ "请款人": 5,
+ "请款日期": 5
+ },
+ "subTableOperations": {
+ "View_任务工时统计": 5,
+ "任务工时表": 5,
+ "收益变动记录表": 5
+ },
+ "dataFilter": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
+ }
+ },
+ "dataPermissionType": 4,
+ "roleNames": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
"Columns": [
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -53,6 +264,13 @@
"Name": "工时ID数组",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "请款金额",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "nvarchar",
@@ -85,13 +303,13 @@
{
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "计算提成",
- "GUID": "e22489f2-ffb0-4862-8930-2fe4ad1b6454"
+ "TableName": "任务工时表",
+ "ColumnName": "预算收益",
+ "GUID": "b97325e6-4d71-4db8-a6e5-8176279884c3"
},
"AggregateFunction": 4,
- "DataColumnName": "计算提成",
- "DetailTableName": "View_任务工时统计",
+ "DataColumnName": "预算收益",
+ "DetailTableName": "任务工时表",
"Name": "总收益",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
diff --git a/Tables/财务/付款凭证表.json b/Tables/财务/付款凭证表.json
index 6a5d1e8b..900b2455 100644
--- a/Tables/财务/付款凭证表.json
+++ b/Tables/财务/付款凭证表.json
@@ -83,6 +83,13 @@
"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": "流程实例ID",
+ "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",
@@ -114,5 +121,13 @@
"PrimaryKey": [
"ID"
],
+ "Relations": [
+ {
+ "PrimaryTable": "ACT_HI_PROCINST_View",
+ "PrimaryColumn": "ID_",
+ "ForeignTable": "付款凭证表",
+ "ForeignColumn": "流程实例ID"
+ }
+ ],
"Indexes": []
}
\ No newline at end of file
diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json
index abda7d4a..838aa6f7 100644
--- a/Tables/项目/项目平行视图.json
+++ b/Tables/项目/项目平行视图.json
@@ -61,39 +61,43 @@
"userFieldName": "项目经理",
"filterType": 4,
"condition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "项目平行视图",
- "ColumnName": "项目经理",
- "GUID": "14ae1605-6733-4e61-ac59-bd43adefaae6"
- },
- "Value": "%CurrentUser.UserName%"
- }
- }
- },
- "dataPermissionType": 2,
- "roleNames": [
- "FGC_LoginUser"
- ]
- },
- {
- "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core",
- "config": {
- "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core",
- "operationTypes": 5,
- "dataFilter": {
- "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core",
- "userFieldName": "项目经理",
- "filterType": 4,
- "condition": {
- "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
- "CompareType": 6,
- "ColumnBindingInfo": {
- "TableName": "项目平行视图",
- "ColumnName": "项目成员",
- "GUID": "bc21b445-dab5-462a-9cc7-df1b588d0b58"
- },
- "Value": "%CurrentUser.UserName%"
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目平行视图",
+ "ColumnName": "项目经理",
+ "GUID": "14ae1605-6733-4e61-ac59-bd43adefaae6"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 6,
+ "ColumnBindingInfo": {
+ "TableName": "项目平行视图",
+ "ColumnName": "项目成员",
+ "GUID": "c6e9f69b-7ce3-4ade-815a-d41725496ddf"
+ },
+ "Value": "%CurrentUser.UserName%"
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目平行视图",
+ "ColumnName": "立项流程示例ID",
+ "GUID": "5df5aa23-1695-492e-aa02-ea6c6f5adc3c",
+ "RelationBinding": {
+ "RelatedTable": "ACT_HI_PROCINST_View",
+ "RelatedColumn": "ID_",
+ "DisplayColumn": "START_USER_ID_"
+ }
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ ],
+ "RelationType": 1
}
}
},
@@ -155,6 +159,7 @@
"ID": 1,
"严格模式": 5,
"公开": 5,
+ "删除": 5,
"工时分配方式": 5,
"开启反馈收集": 5,
"所属客户": 5,
@@ -165,8 +170,14 @@
"计划开始日期": 5,
"项目代号": 5,
"项目分组": 5,
+ "项目可分配工时": 5,
+ "项目可核定工时": 5,
"项目名称": 5,
+ "项目实际工时": 5,
"项目封面": 5,
+ "项目已分配工时": 5,
+ "项目总分配工时": 5,
+ "项目总核定工时": 5,
"项目成员": 5,
"项目方案": 5,
"项目状态": 5,
@@ -174,13 +185,7 @@
"项目经理": 5,
"项目预算工时": 5,
"项目预算费用": 5,
- "预算方案": 5,
- "项目总分配工时": 5,
- "项目已分配工时": 5,
- "项目可分配工时": 5,
- "项目总核定工时": 5,
- "项目可核定工时": 5,
- "项目实际工时": 5
+ "预算方案": 5
},
"subTableOperations": {
"任务平行视图": 5,
@@ -203,6 +208,7 @@
"ID": 1,
"严格模式": 5,
"公开": 5,
+ "删除": 5,
"工时分配方式": 5,
"开启反馈收集": 5,
"所属客户": 5,
@@ -213,8 +219,14 @@
"计划开始日期": 5,
"项目代号": 5,
"项目分组": 5,
+ "项目可分配工时": 5,
+ "项目可核定工时": 5,
"项目名称": 5,
+ "项目实际工时": 5,
"项目封面": 5,
+ "项目已分配工时": 5,
+ "项目总分配工时": 5,
+ "项目总核定工时": 5,
"项目成员": 5,
"项目方案": 5,
"项目状态": 5,
@@ -222,13 +234,7 @@
"项目经理": 5,
"项目预算工时": 5,
"项目预算费用": 5,
- "预算方案": 5,
- "项目总分配工时": 5,
- "项目已分配工时": 5,
- "项目可分配工时": 5,
- "项目总核定工时": 5,
- "项目可核定工时": 5,
- "项目实际工时": 5
+ "预算方案": 5
},
"subTableOperations": {
"任务平行视图": 5,
@@ -251,6 +257,7 @@
"ID": 1,
"严格模式": 5,
"公开": 5,
+ "删除": 5,
"工时分配方式": 5,
"开启反馈收集": 5,
"所属客户": 5,
@@ -261,8 +268,14 @@
"计划开始日期": 5,
"项目代号": 5,
"项目分组": 5,
+ "项目可分配工时": 5,
+ "项目可核定工时": 5,
"项目名称": 5,
+ "项目实际工时": 5,
"项目封面": 5,
+ "项目已分配工时": 5,
+ "项目总分配工时": 5,
+ "项目总核定工时": 5,
"项目成员": 5,
"项目方案": 5,
"项目状态": 5,
@@ -270,13 +283,7 @@
"项目经理": 5,
"项目预算工时": 5,
"项目预算费用": 5,
- "预算方案": 5,
- "项目总分配工时": 5,
- "项目已分配工时": 5,
- "项目可分配工时": 5,
- "项目总核定工时": 5,
- "项目可核定工时": 5,
- "项目实际工时": 5
+ "预算方案": 5
},
"subTableOperations": {
"任务平行视图": 5,
diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css
index 602e7a0d..4d75e75b 100644
--- a/UserFile/BaseCss.css
+++ b/UserFile/BaseCss.css
@@ -4,10 +4,25 @@
}
/* 图片满铺 */
-.img-cover .Fgc_2 {
+.img-cover > * > :first-child {
background-size: cover;
}
+/* 动态文字 */
+.img-cover label.fgc-whitespace-pre {
+ background: #00000029;
+ height: 100%;
+ padding: 15px;
+ text-align: left;
+ text-wrap: wrap;
+ transition-duration: 0.3s;
+ opacity: 0;
+}
+
+.img-cover:hover label.fgc-whitespace-pre {
+ opacity: 1;
+}
+
/* 版本标签样式 */
.versionTag label {
width: auto !important;
diff --git a/image/项目图标/返回.svg b/image/项目图标/返回.svg
new file mode 100644
index 00000000..2eecc698
--- /dev/null
+++ b/image/项目图标/返回.svg
@@ -0,0 +1 @@
+
\ No newline at end of file