From 2882c25cdac68dc9fa6f306cc4b6c77175ccb805 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 20 Aug 2025 15:27:01 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5"},{"State":1,"Type":1,"Name":"PCPage/=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=8F=8D=E9=A6=88=E5=B7=A5=E5=8D=95"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 24 +- Pages/项目/项目反馈/处理反馈工单.json | 28 +- .../任务容器页面/工时/新增报工.json | 362 +++++++++++++----- .../项目首页-容器页面/任务容器页面/工时/新增报工.rd | 20 +- 4 files changed, 300 insertions(+), 134 deletions(-) diff --git a/.collaboration b/.collaboration index b9067d81..b99c2267 100644 --- a/.collaboration +++ b/.collaboration @@ -690,17 +690,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T15:08:09.4405994+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -848,17 +838,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T15:08:09.4408706+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目任务分组详情", diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 9541d12e..03f14eb5 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -821,7 +821,7 @@ "BreakpointIdentity": "dd5dfb56-1609-477a-b42e-d791b31f86de" } ], - "ID": "baacf6f7-bebc-469e-a12a-35dd5c57acc0" + "ID": "31dd1d4d-b365-444d-9b85-314d9e509734" }, { "CommandList": [ @@ -835,13 +835,13 @@ "BreakpointIdentity": "1947013d-c6db-4bdb-8bbc-1527194baef5" } ], - "ID": "e54bc261-640d-4e25-9853-37dec8c967c2" + "ID": "5e1dd9a7-f4f3-44dd-b954-8dad2ea3c6d8" } ], "BreakpointIdentity": "85f560e9-2bb8-43fb-8745-53cf07517a5e" } ], - "ID": "65a144bd-2fee-4fb3-9cca-4da5bd41a460" + "ID": "cb00a45a-42e6-4759-8f56-787b41c25433" }, { "CommandList": [ @@ -852,13 +852,13 @@ "BreakpointIdentity": "038456c4-8274-4b66-ac61-d1fedc537548" } ], - "ID": "06250e50-2111-4317-900d-d5954de52b36" + "ID": "1e28bbf0-cedb-47a6-a15a-26161b84179b" } ], "BreakpointIdentity": "b2ab54a1-2128-4135-8168-91be2f0de957" } ], - "ID": "32072b41-cd8b-4cf2-89a2-5ec18c91c2ca" + "ID": "d2303a5c-9ae9-4905-9804-8d0d01836654" }, { "CommandList": [ @@ -899,13 +899,13 @@ "BreakpointIdentity": "7cc7974d-b682-41fa-bf89-81749c6ef02f" } ], - "ID": "16450902-3ad2-4710-8d31-8558a069d7c3" + "ID": "dd42e1ce-4346-46ea-b94e-3d013e9038d8" } ], "BreakpointIdentity": "4bfd9b52-39e7-4bcc-bd53-bdbe019890ba" } ], - "ID": "a51402a8-dc0b-462a-9c6b-8319c9a3157d" + "ID": "ee1c028f-6310-40e5-bde1-c476a48259d2" } ], "BreakpointIdentity": "45417697-5dd4-4f98-8b7a-04f0f962c66c" @@ -1191,7 +1191,7 @@ "BreakpointIdentity": "a4127f7c-5cf9-4377-8e0c-26165974d6d6" } ], - "ID": "d89a3ab5-9ffb-4b4c-ac69-b76a60f38a0f" + "ID": "3a13fccc-6bf0-4b51-8e69-ecb4329cf675" }, { "CommandList": [ @@ -1207,7 +1207,7 @@ "BreakpointIdentity": "63407a1b-5292-49be-9606-7ad4aec87c35" } ], - "ID": "b47cce98-8f7c-4095-9571-d21544342b90" + "ID": "7ca85630-7794-4b14-adb5-f6e98ee9f675" } ], "BreakpointIdentity": "e3dada0e-65b9-450d-b4f6-c0c182f1c426" @@ -1409,7 +1409,7 @@ "BreakpointIdentity": "58ed15dd-c248-4b95-beaa-7e2c1a00fb94" } ], - "ID": "c86c5554-ebb3-40e6-a44b-a5ec31d86633" + "ID": "a9e55bee-b84b-4f56-b8a0-2418eb331d13" } ], "BreakpointIdentity": "ee097a72-7523-4a1a-aad5-05397331cfb1" @@ -2051,7 +2051,7 @@ "BreakpointIdentity": "4892ef7f-fb2d-41ad-90e5-aad95880f3bc" } ], - "ID": "0cf834d1-1246-4c7c-a004-8e0f654ef850" + "ID": "6c5eee67-a63d-455d-89e1-366f35d56a6a" } ], "BreakpointIdentity": "b9c1557b-fde8-4a51-aeaf-b87bbfd66cf2" @@ -2088,7 +2088,9 @@ "Underline": null, "Strikethrough": null }, - "IsInvisible": false + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", @@ -2134,4 +2136,4 @@ "Formula": "处理反馈工单!$AB$21" } ] -}//mnA7QbcvA9SAngV5y67ANI81cpl+ObadboHEOU2l2kei3tvyvaZ70wqnmjqdKIzhKoC+5pHByIqo49R2wTN79ztzLm2D9xQAu4nlaKMxm6stXfsLQ65Gql7RVazgh9VaCIXKPMzijoUYZRBVt+830swMWVYWe06jl6hru3Mz11p5smPVWhFep9YaLSVkGdhjFrVeSswjGq2jPQz6qd+Z+h+0OtrW4JUDoiIKuYmFnPga5G7JMevqdJwkCvJkMhv3JhzzYl9rEysb78HQIJHqkfvHbaOJJxv0Bbu0pZTqwhYWZmfJ8OwPsgllxPi/NM/KznLOteqeFslC3VWAcCJeEFVqz39kNS5IkE4e2mJFHMIK5MHFZJHEEzv94lKaeTnhVCkpcLe4/WiCO92raJfxVk55PxbAnttO5Dnh1cLC5Q/krRRIZzgGzWp5ny6W80r9EItVYSpNQdnl9gGYSjMeeTHbCFfdZF4fRJp4gHPihdAsj1EE4ANhxOYte9/g8XuVFoDeeRXjPgB17E3Rbrsz6gJsLG25XkTyhHpNofW/eZSiKwFtaoVUS4rtpgAlie21pBY7MInAaWlYgw8fy6DzKDQQ2Rl1Qn1S219FVBGdX+hDfQTTxrQLPHcjX8KAqVNOZikml+n6A8UySNIRDECV2woOF9DJKkr8GIotyEjc1bWwQigEM8b4VVp0XICSGZDN/1F3fYStjyCGbzxWaitIu4DyJvoevQuLjj/EnQ5XeX+70D0WtxsOXfyRMLN+JHyUoH9g0Zfug4oKuhm0sgPeayCgwCNVL4RrCtL6u61l30QhgulNuw45GwTvauAwGqNwOi9fhG5kL93hEQtaSgGEnymswsMxb1WuW7fu8wLiMphKIoMsSw4s7PXXCt8n9PbUXy8M8oLP3Qia1nVVFVRg/g==|920 \ No newline at end of file +}//Jmf/3ewPjsMd27d0ECARRgLYBdA+yMNm8adY6vXNXTvXqSuLu7AcEV74JYm0Tz0r0q2ZSwHHyjmHSUCvWSYp9sPila+7RIfqt1u5+Zs9JTcFAfqajN48cmfNwS8UC+gFIp50yHhNoBk4L7yZ1L+Z8RwDm6YIoQ8/sqRwFmPg3bpDPltsLKvChQPpaHMZuf7KNHE/W4C5FSSBpIMgQ22ddaSWVpKPU3OP5vCdbKLW2bychr//4RCZzESMsQQfxjcO91ZY7BBpsK9WaEppl2pAR8wBeC1gdi0o5Cbktr/b+ImI2QVQwQ6SqgiHwMqe/b/lkLcaxP+L/HrnmNWU6huY6LJOCvplGAoeF1uzPe2T1SoUsdu1YQnJOV5PzRX2ZnCgbop3qqzG5tGFrvIxiNX2kGAj7Atrk5v2Tih0OtlOcgoBYjuG0zQxq2EB1+iq+os+G/MAho1mjWo/S/RwIRH2eXp+l+1Jg7FV94Ig6KHkftHvJzWOHlDvKS39FBz92Typ8Yih1FDTGBKNMN83hgImZPKqPQY6Op0/SThIZVrZ89fu84jEw7D0J361pG782m+AYRO2jRKpQTpd7stqctEZTkJgHuA+vQrCgsW8UOZ5NgigYc4KacvTNrbL/yvCX0V2rfK7q282MOdVt+rfYigI+ace3n/E9jo3wEsL8yTF2Es7Noqbyg1Mb+F7bBKnICxMrIommHcW6vTVSGv1ktZojDbIkKygt5G6VZvgAWl2guv5xbfaUv3KV2JC5uIOOwKg9+ssb6KLNTA+sgn1pclx4NeGg0B16LK7iYDAUCZbvEkhVh2GhRTVyWExu9y8PgimerQbGviaTQPuoU+OOvzHhZZA5h0G2oLm9dQ/K2psPDiFqS2jmnhaKTrFm3FHoL+smxtyf5ujwPI7BhxIYAJq4Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 466c575a..3f9e0e72 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -119,12 +119,12 @@ }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 20.0 } }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 10.0 } }, "27": { @@ -139,18 +139,28 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0 + "DesignLengthInPixel": 35.0 } }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0 + "DesignLengthInPixel": 24.0 } }, "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0 } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0 + } } }, "InLogicalVisibleIndexes": [ @@ -158,11 +168,11 @@ 16, 17, 18, - 29, - 30, - 31 + 31, + 32, + 33 ], - "Count": 32, + "Count": 34, "DefaultSize": 24.0 }, "Cols": { @@ -260,11 +270,12 @@ "12,1": "工时数", "16,1": "特定时薪", "20,1": "工作进展", - "27,1": "取消", - "27,14": "提交" + "25,1": "关联反馈", + "29,1": "取消", + "29,14": "提交" }, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1" + "31,5": "DATEDIF(F32,N32,\"d\")+1" }, "AttachInfos": { "2,1": { @@ -580,7 +591,7 @@ "BreakpointIdentity": "288ae14e-7ae8-4471-a9d8-d1117ba04e93" } ], - "ID": "66c07432-aa82-449b-a07b-fb28d21e10c6" + "ID": "5e369651-f961-4fe5-95bc-5b60e520ca49" } ], "BreakpointIdentity": "7f14170f-5452-40d1-ac31-92b4ec16a0ee" @@ -609,7 +620,7 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B15<=新增报工!F30*24" + "SerializeProperty": "=新增报工!B15<=新增报工!F32*24" }, "IgnoreBlank": false, "ShowInputMessageWhenCellIsSelected": false, @@ -751,7 +762,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B32" + "SerializeProperty": "=新增报工!B34" } }, "BreakpointIdentity": "192eb566-4308-4a85-9b6a-05a84f54f6cf" @@ -763,7 +774,7 @@ "BreakpointIdentity": "5a93ac16-d8bb-4810-99ca-aba9158ae768" } ], - "ID": "18da5af4-06c8-4d8c-b7a6-04bdd99895ed" + "ID": "40e75690-9c5a-4254-8546-7b44d29b61ec" }, { "CommandList": [ @@ -907,7 +918,7 @@ "BreakpointIdentity": "f0c63aab-624f-4261-8c4a-bb5297b965e0" } ], - "ID": "cd0b0996-0675-4337-9eff-09e42b60e914" + "ID": "da8f22eb-e99a-4700-8cb0-8f04b06a415a" }, { "CommandList": [ @@ -921,7 +932,7 @@ "BreakpointIdentity": "b39da01c-4746-4b70-9f96-566c899c52c0" } ], - "ID": "cd442673-fe4f-4dd7-8a08-54742115acf9" + "ID": "4b975f2b-7996-4965-b25a-4aa254fd4a27" } ], "BreakpointIdentity": "892e92c7-7bd0-41c2-9a8a-b79f74c2a848" @@ -937,13 +948,13 @@ "BreakpointIdentity": "45e1ac21-fa09-49b0-8f04-8e0f37b47cdd" } ], - "ID": "95c428b3-f3fd-49d1-9959-28435a869e1e" + "ID": "dec4a932-8a89-43a4-868f-286f16b8d8cb" } ], "BreakpointIdentity": "0a4bc035-9eb0-4273-b7dc-8f8abc84129c" } ], - "ID": "c2837079-8c7a-4c09-a094-25bf6f62e9ca" + "ID": "026cacec-1468-4ddc-91c0-698b10a004fb" }, { "Condition": { @@ -1121,7 +1132,7 @@ "BreakpointIdentity": "bc782bdf-defb-4114-8feb-9acc88997380" } ], - "ID": "4b5aba92-ec5f-41d6-a88f-aeaede7cbd9c" + "ID": "8e542b26-7041-487a-bde6-f56115766f5c" }, { "CommandList": [ @@ -1131,13 +1142,13 @@ "BreakpointIdentity": "7336e69c-fccf-4984-b772-6f90bf0c2ac9" } ], - "ID": "86d5dc44-1271-49a4-9fb3-e127f98a38ae" + "ID": "3c93df20-f8fe-475e-8a6c-4163b3f5dadc" } ], "BreakpointIdentity": "ae9024a5-a15f-4fdd-aa20-843a2fb33efa" } ], - "ID": "7b28b7ef-49b3-49bf-93a3-06990db1f136" + "ID": "24b541df-c9cd-4df0-a72e-8f19c39ce23f" } ], "BreakpointIdentity": "2067e7f3-4a3c-443d-bb29-4717d6cc34a0" @@ -1193,13 +1204,13 @@ "BreakpointIdentity": "507b7a54-bc30-4b84-abee-fd163cd856ba" } ], - "ID": "986ece36-a5ca-4e55-aaf8-39733384d6d1" + "ID": "a3945641-5736-41db-bf91-cf44aded3ffc" } ], "BreakpointIdentity": "372608e7-4d70-481f-8afe-902ca1d1f546" } ], - "ID": "781a63d9-d638-4716-aa8a-946db07507ee" + "ID": "732aa3e2-83ac-43ea-9df0-0a52e679697a" } ], "BreakpointIdentity": "4bc6b6dc-b3c8-4ec9-9283-2bdf729ff1c2" @@ -1257,6 +1268,148 @@ } }, "27,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": "39187c87-fd8d-4b69-aec3-1d636800ca1f", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "8b3d9f04-4e79-408e-a224-93c870a211a8" + }, + "ColumnName": "value", + "Alias": "值" + }, + { + "GUID": "c46e60de-6ac1-4c2f-ac92-96c38bad696f", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "标题", + "GUID": "55a27d8e-e81b-410e-b826-e1c7a6f25c0e" + }, + "ColumnName": "label", + "Alias": "显示文本" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "关联任务", + "GUID": "cbc052d4-a1a0-4616-836b-13465b66bec4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "e57427fc-1805-4128-98f5-6f8a70db6673" + }, + "Value": "%Null%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "处理人", + "GUID": "9205005e-3cf4-4b0f-a231-6c03f1843767" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!报工人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "a38b2294-8e8e-4dec-b159-b953092a851d" + }, + "Value": "1" + } + ] + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "FGC_CreateDate", + "GUID": "d7fd6f83-0bb7-42ed-8f56-351c518d223f" + }, + "Order": 0 + } + ] + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterable": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + }, + "DataValidationInfo": {} + }, + "29,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1269,7 +1422,7 @@ "TemplateKey": "_RS_Information3" } }, - "27,14": { + "29,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1551,7 +1704,7 @@ "BreakpointIdentity": "9a5ead74-4e20-4bf5-88b4-bea61d050a2d" } ], - "ID": "1cf90cac-7e16-42b0-b9e6-90689aaa7590" + "ID": "623dbc43-5633-420e-9af6-6313520099b2" }, { "CommandList": [ @@ -1567,13 +1720,13 @@ "BreakpointIdentity": "3697b31d-8759-4a2a-8b3f-fa4aacc0e369" } ], - "ID": "3169f97d-5df5-48cf-a401-dec150ecd19c" + "ID": "17383282-35f1-492c-8f9f-9b79f6e5f462" } ], "BreakpointIdentity": "438a3a0d-f98e-418d-9a29-a59df3fd4510" } ], - "ID": "4f111d6a-cc0b-4e17-85c7-fe51cfb56187" + "ID": "aa4eb46e-e563-4907-a74a-d0e7cb4f7b6d" } ], "BreakpointIdentity": "40cf13ed-3c5a-49f3-925c-f3203401639c" @@ -1661,7 +1814,7 @@ "BreakpointIdentity": "6c2551be-d3f1-407a-aa58-1ddfe5f912de" } ], - "ID": "a52de498-61ce-4301-8dc2-011ade1c26c9" + "ID": "9cdcf282-a650-4274-9e4d-cde681738c8b" }, { "CommandList": [ @@ -1677,7 +1830,7 @@ "BreakpointIdentity": "542f964e-2ad1-41f2-b904-dae10b780399" } ], - "ID": "e976a69c-64d7-4452-a68b-f091290183f5" + "ID": "3c5908d4-753d-45e7-b052-b2059a10f099" } ], "BreakpointIdentity": "414200cd-0974-4b5d-a707-c9c9b91ceeea" @@ -1694,14 +1847,14 @@ "IconSize": 14.0 } }, - "29,1": { + "31,1": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", "GUID": "817d21e7-faf6-4b91-bb3b-4bb0c0f11004" } }, - "30,1": { + "32,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -1713,7 +1866,7 @@ } } }, - "30,4": { + "32,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -1725,14 +1878,14 @@ } } }, - "30,8": { + "32,8": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目经理", "GUID": "3fc6f831-d0e8-482e-81bb-e3945ce4820e" } }, - "31,1": { + "33,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -1775,16 +1928,13 @@ "Foreground": 6, "Formatter": 1 }, - { - "BorderBottom": 0 - }, { "FontFamily": 2, "FontSize": 13.333333333333332, "Formatter": 1 }, { - "Background": 8, + "Background": 7, "FontFamily": 2, "FontSize": 13.333333333333332 }, @@ -1801,13 +1951,7 @@ "#FFFF0000", "Right", "Text 1 35", - "Background 2 -10", "#FFFFFF00" - ], - "Borders": [ - { - "Color": 7 - } ] }, "CellStyles": { @@ -2023,30 +2167,70 @@ "24,15": 1, "24,16": 1, "24,17": 1, - "25,1": 7, - "25,2": 7, - "25,3": 7, - "25,4": 7, - "25,5": 7, - "25,6": 7, - "25,7": 7, - "25,8": 7, - "25,9": 7, - "25,10": 7, - "25,11": 7, - "25,12": 7, - "25,13": 7, - "25,14": 7, - "25,15": 7, - "25,16": 7, - "25,17": 7, - "27,1": 8, + "25,0": 1, + "25,1": 4, + "25,2": 1, + "25,3": 1, + "25,4": 1, + "25,5": 1, + "25,6": 1, + "25,7": 1, + "25,8": 1, + "25,9": 1, + "25,10": 1, + "25,11": 1, + "25,12": 1, + "25,13": 1, + "25,14": 1, + "25,15": 1, + "25,16": 1, + "25,17": 1, + "25,18": 1, + "26,0": 1, + "26,1": 1, + "26,2": 1, + "26,3": 1, + "26,4": 1, + "26,5": 1, + "26,6": 1, + "26,7": 1, + "26,8": 1, + "26,9": 1, + "26,10": 1, + "26,11": 1, + "26,12": 1, + "26,13": 1, + "26,14": 1, + "26,15": 1, + "26,16": 1, + "26,17": 1, + "26,18": 1, + "27,0": 1, + "27,1": 1, "27,2": 1, "27,3": 1, + "27,4": 1, + "27,5": 1, + "27,6": 1, + "27,7": 1, + "27,8": 1, + "27,9": 1, + "27,10": 1, + "27,11": 1, + "27,12": 1, + "27,13": 1, "27,14": 1, - "29,5": 9, - "29,12": 1, - "29,13": 10 + "27,15": 1, + "27,16": 1, + "27,17": 1, + "27,18": 1, + "29,1": 7, + "29,2": 1, + "29,3": 1, + "29,14": 1, + "31,5": 8, + "31,12": 1, + "31,13": 9 }, "SheetStyle": { "FontFamily": 2, @@ -2056,21 +2240,22 @@ "Spans": [ "14,1,1,17", "22,1,2,17", - "27,1,1,3", + "29,1,1,3", "10,1,1,17", "18,1,1,17", "6,1,1,17", - "27,14,1,4", - "29,13,1,4", - "29,5,1,3", - "29,8,1,4", - "30,1,1,3", - "30,4,1,3", - "31,1,1,3", + "29,14,1,4", + "31,13,1,4", + "31,5,1,3", + "31,8,1,4", + "32,1,1,3", + "32,4,1,3", + "33,1,1,3", "2,1,1,17", - "29,1,1,4", - "30,8,1,3", - "31,4,1,3" + "31,1,1,4", + "32,8,1,3", + "33,4,1,3", + "27,1,1,17" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2137,7 +2322,7 @@ "BreakpointIdentity": "5f419cb3-3648-4bd9-9b11-04d5c09db727" } ], - "ID": "3e9c3309-0328-4efa-b1b3-a33261d9b4a6" + "ID": "cfb2be57-439c-479b-8862-cdbf5862fddb" }, { "CommandList": [ @@ -2155,7 +2340,7 @@ "BreakpointIdentity": "bdc7ba4a-7ff5-4c48-a983-1394685a4bce" } ], - "ID": "31bdf377-b397-451d-bdf2-56b75185921b" + "ID": "92232962-5fc4-4223-b18e-f6e939529962" } ], "BreakpointIdentity": "b1871849-00b3-4090-a8fe-67a8292b2f59" @@ -2177,7 +2362,6 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务平行视图", "ConditionFormatRulesCollection": { "Rules": [] } @@ -2189,7 +2373,7 @@ "CustomNames": [ { "Name": "版本ID", - "Formula": "新增报工!$B$32" + "Formula": "新增报工!$B$34" }, { "Name": "报工人", @@ -2197,11 +2381,11 @@ }, { "Name": "仓库ID", - "Formula": "新增报工!$E$31" + "Formula": "新增报工!$E$33" }, { "Name": "分支名称", - "Formula": "新增报工!$B$31" + "Formula": "新增报工!$B$33" }, { "Name": "工时数", @@ -2213,11 +2397,11 @@ }, { "Name": "结束日期", - "Formula": "新增报工!$N$30" + "Formula": "新增报工!$N$32" }, { "Name": "开始日期", - "Formula": "新增报工!$I$30" + "Formula": "新增报工!$I$32" }, { "Name": "任务ID", @@ -2225,15 +2409,15 @@ }, { "Name": "项目ID", - "Formula": "新增报工!$B$30" + "Formula": "新增报工!$B$32" }, { "Name": "项目经理", - "Formula": "新增报工!$I$31" + "Formula": "新增报工!$I$33" }, { "Name": "反馈ID", - "Formula": "新增报工!$E$32" + "Formula": "新增报工!$B$28" } ] -}//7n/1IY/lBmKsQIFYGhW+YIKwurTUVDo5tEmsSRpGgeuB77rdBMvnit6MlkMzBarGg1EKDbT0cY7BknUjbPQx8qnNG+DeCKGyPwKcRDMrxi2kHS+Oye/YaOYYFkHycRdZmJZ2EKAM6o3gMxIu7y/2RYNu9YKd1Bhfqol9jXt2sswRlW9XbmI/KdNyff6zLTxS0K0OkOYNgnaQyKV6D1Fqz71qlTfs1u+0aGbUXOqXp1Mbfm45Co8ANjw99KEVVqoytMst1/ytdKdPKT0L5CtdjFYWLFH8GdG5IsThysO0MHendUN6gd2a5gDaaSEh+5HfgEwhF/6ZvlG1o2OxRVZtR3dOGiigNSVwM+iAykL7yKn0ez3aDlO5ul7NiO+E17uLC1OookzZLHcBE3/6aATZtcb+n0MuT+9PwfnEv9W+C7gW/sGq43Eggu0XFTkQZjK4Um02F0CcTx1fL64Nnu9dg7UTCg/O3KTWF9oE3/Fl3uQ+YTi8GguEdIx1gPSInBioLZRl84WMfrs9nRfeqm4LKSAeaFbeSsQ4QMRYTHd379k2ozaMTrNGBUuHstELtixvuhCR4hxQnefYgvv72MzzZJjutv4ivBbc8/wzVNaC2gXv8xpJcYRISOxkFs+dKnKvcoNPZvZ0ih1BztHrXXkNp3tmmshFErdzGkB+cBS8mdPggMaxNIG8Gcylc30n3ZXNHpgRfABtSFCpehhJjCOBRyLx44egT9V8eqvSR4L5ZDn7DYiKPN547sDkSwSic/EcVjWhH2XonP39coVYescw/s3hUYMidgas1DLQ4nlz7aSj07gAPOrKaL6deqJqUKWWgCzRLjY8F6xBsSVDDiUvMwJ2dCO6ghmhepR7o7AGrCgWb0j4YRa2HWGMn+OFj/Nqq8w7fFufygFQAu2MAbMUAg==|920 \ No newline at end of file +}//FghPxEcAEhfBrD15h6HvaeRZs2keaPy1kKB6zZuNMEtqG3hOQAeNQabmZMi+nrk6EIYLF8ytD9oVod6zBDbSrYlRDHXmUrx8abdFoj/upN0v3bmp2qPMEgN0CI776rFMZ5ydiR/MzsyKheM/MQQTiUXhT+R8/k7Khi0LfbXMSnSOgKjux3dfekplA+oFjgk1vexsdDwHHVSc/MHFvrEixUyAfCnwtMu98t5BYvgtmw0kDY7vbEXlPesLU4kiscs2sBV4CyX+usFKuiNqd4RsO6Yt76U8g0pNUuy4OfMXmNWhiC/PwjRguVHYI9o8XGfPzS5M1jlwReROBS3R5xYHv99DYY0FGEf1TdZIfl/JjvKS1lTPU1QyU9yA8IMecu7gN34lf2Qq9IZkgwsCjlfxJGrhjoeG/WRnSBXyOg+3b3+X/Aon43+uE4fXFRdE1dGcdWsQfxoxCREja/DW7Z83NDCO51sluWGRBtMwOj0h/3B7hZ+o3H9vrRAYTu5R3jQR9yt3M5/8xWV1pZPaMiRLqXm96678GTomY4Kp7/enCMdcdypRTYQ0r6+ZK0Tv1UNPQgtKOz2B9FEbLKRhERPDEos9BWWL5R1xq1ko0VsHBzncgDiNmLAjDfhghSpxpQYG/OTgzP23q0J/sGeI7o+O41IO2wcrIgkndIgAv542ZcPdimlVIS7rG3+WQERh3Mv1nL1x0emIsVjfEkMWO6+bhFKzFEAcDScYpO1mDpdyVuY1K7+r4PLtGefoD41bbL+yJVWouQAbGQbBLrDTgDMosbFIJa4Evx5sIL3nSY8Qme2IJOcJd/gcag2EZUHWuu0/qrXLF9D0rMQChZlDCcO70Yq7V1yKHvcslV6oxgCrCap9mE/vws7aC+0pIxu++2MJJ6BOMUrnz3+LvJj+B5lBTg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd index e0c288e4..5b9dfaa6 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd @@ -1,14 +1,14 @@ { "PageType": 0, "ColumnCount": 19, - "RowCount": 32, + "RowCount": 34, "Formulas": { - "29,5": "DATEDIF(F30,N30,\"d\")+1" + "31,5": "DATEDIF(F32,N32,\"d\")+1" }, "CustomNames": [ { "Name": "版本ID", - "Formula": "新增报工!$B$32" + "Formula": "新增报工!$B$34" }, { "Name": "报工人", @@ -16,11 +16,11 @@ }, { "Name": "仓库ID", - "Formula": "新增报工!$E$31" + "Formula": "新增报工!$E$33" }, { "Name": "分支名称", - "Formula": "新增报工!$B$31" + "Formula": "新增报工!$B$33" }, { "Name": "工时数", @@ -32,11 +32,11 @@ }, { "Name": "结束日期", - "Formula": "新增报工!$N$30" + "Formula": "新增报工!$N$32" }, { "Name": "开始日期", - "Formula": "新增报工!$I$30" + "Formula": "新增报工!$I$32" }, { "Name": "任务ID", @@ -44,15 +44,15 @@ }, { "Name": "项目ID", - "Formula": "新增报工!$B$30" + "Formula": "新增报工!$B$32" }, { "Name": "项目经理", - "Formula": "新增报工!$I$31" + "Formula": "新增报工!$I$33" }, { "Name": "反馈ID", - "Formula": "新增报工!$E$32" + "Formula": "新增报工!$B$28" } ] } \ No newline at end of file