From 267f24034a08ad5a18b78612c1cc2280c6f4333d Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 20 Nov 2024 22:38:50 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=B1=87=E6=8A=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E7=AE=A1=E7=90=86"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 24 +- Pages/汇报/汇报管理.json | 10 +- Pages/汇报/汇报详情.json | 591 +++++++++++++++++++++++++++++++-------- Pages/汇报/汇报详情.rd | 12 +- 4 files changed, 489 insertions(+), 148 deletions(-) diff --git a/.collaboration b/.collaboration index c8597c9b..d9b786b3 100644 --- a/.collaboration +++ b/.collaboration @@ -754,17 +754,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:34:19.6820231+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -792,17 +782,7 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:35:48.7556299+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/内建手机页面", diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index 0616cb34..356796bc 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -592,7 +592,7 @@ "BreakpointIdentity": "fe21a9d4-7f63-4c20-b8ee-92802685f730" } ], - "ID": "15acec5c-f6af-4fdc-8f1d-a2dd3bc2535d" + "ID": "45ba49fe-7e35-4bff-9631-ac0253c54880" } ], "BreakpointIdentity": "3bde7a6b-4452-4e87-bf23-ff7318d8c72a" @@ -795,7 +795,7 @@ "BreakpointIdentity": "067210c8-f821-4699-91a4-e50a4454438e" } ], - "ID": "7f254b10-1453-4461-99c0-8c2b4e8fbd4c" + "ID": "fefc23b9-b145-4a05-b2d3-3e7291945661" } ], "BreakpointIdentity": "d924b5c8-ba40-430e-95e3-639c51364e9c" @@ -1233,6 +1233,10 @@ { "Value": "项目", "DisplayValue": "项目" + }, + { + "Value": "客户", + "DisplayValue": "客户" } ], "CommandList": [] @@ -1820,4 +1824,4 @@ "Formula": "汇报管理!$R$8" } ] -}//p0589fck3u9Xwg2jaHYojGe1W22UzXYf5GQbxIxGYxjMeX7vyrTprCbN7TTyL7hgO7eYSYolX2ZMboT2KmKb1QnfnxWjk0nRJPwUyZDqlKcjMqHk6EK6OR9EQrnx41xlGF7ZaLRdk4T0Q1sBGxHYU8EUkjegO1PciCEy9OzS0bog2ipbCPW51ZqwsZS7sKxh9hLmJPGJEy4hmdxpwd8tUzqY9xUsWhh4Q2MaBW86uq/zppKyDOUCxyxopabUpiMfZQx82w4gPFY2LoNChYiOgwavA7LwxzrLUSQOisKDzMzP/KPh/obBqjwr93zgZPR0szyKwRvRsCfxBUpFg9vyLRbTBBlDJyhulEqZr6p+1pkEOyBMHXP9996kKgjIWKG1rQ4pEXnU5khNg5QGLcQWfv0iYJ6/bkgGkzLxpk33LW4JgbG3GoqXYN6r0U+VXfyyie8JyAB8gy9YBtVgmMJGtBOkj2N966wiyEfe0PdKLRkFivULnuT1lhU1UPFleVsMaNuVi46g3x7z84DbZLQL1Bra1qo7dFZgHFHcuqpN1Kf6WzJXXogJ5+DBEOB+DvKuU020k7xOqCnExshJigCl7X1AStoDLHNG8UVkBOeSU4RkrpV4xOdwxW3xWFclNenlj8+pHjNPTTc14erXPFRgv5v7rVz38ieBqxIt647LqWDR6HjgCNmQnBRRRZ+EPOTIguhyCtNlU23NBSBO71AuJ+7kRT9+G1qkGHU5Bq7X53c9SpFp/q4MotT6HKZOPb3WG91Gf9OCAmzJe51BIi4vxrZq4qBMCeg+jgTStmptSWyOaENgLbP9IaM8oZJEuFrLl9B+APoX/P55MS+SBC3JUORr/zekjqpUIHoqEkp4SiEYHCtUUITmq3/kw7mrCJG+OfBhQUYjKMzLY4yjzQYRCA==|920 \ No newline at end of file +}//FTZt797rzLDTR4xgFLKjD+3MFw+t1qoCF/GzijW0y3klGaBxrXBrFrUvTt2NaPhbbAhIKSZ7FouBLG+cUBLECcEOKkozkgL8BCkzW8COY3+SKxzokOpNztJMAGJvmTg+x16YZi/SbQb4JJfI0/ztLJjbrQthIai6XJOX3opeRI8fTSgfdTKkTUVrDTHMtGPIHhB/i7onDkGoGaXvkOT6F4xlima6cV3bi+2Oou7qYovrqGuwIR7bI782+YrkuvOTqEnnCmVN3taYSXq+1Fnlp6UnYelYxAEBX15yEfHjMasBNBzlZLx4G1iSfRcgTrq3AHbmRDcD2EiVrAEjdJjmVhP3ZWGXHh+k9bMmTnnJhy+a6kCa31WpoqwYVUonBdgnWKDZJoGjbQ728To2Xz1uXaB4rEpN6e4/VkDuN/fY2M2gubOmrOfB8e26q4fdovnLQUiRWJgJenzoEDykxE1U9LJppJ9QUnTAIupuPDdCSRXwvyy0Ldtr2zLy1mGht/duWQUnzWik2hCv5246qoAAj2GoGFqxda/WWPgPpMLPUbjOarYe3OoJCjwHW8XRqejemXFjj48RnAuKh+FjA0PN9vsBWb7XcriEVBXD3SL8/3QatR6uW4cF9rELnAHa43dl2MlCR5zvRKwWdofW+fwHT5HUl9AeBdeS1+WgdahlW6kH7DxBCCARFK1/OtfM2mADeT9wcOahCfJ2IMSU1YZG2R6I85wnaaGmoCwvO3HldC5KTyIyPYhgS0lirztTGs/8L4YM5Nb0PYQd+ez+hICupV0267j71EosV7u+4EsFqULCW5WaKxVV4zli0n6mX0GTDxgY08xdsNVsOlb0xc0t9xZU/ohoIFOAMfjg9RXvWM1NEQvgv56yYDEcp6Ux6Ijhd6+Pm52SIej6O7prmqoi4A==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index 12133a15..d3854a67 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -58,30 +58,41 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 502.0 + "DesignLengthInPixel": 30.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 490.0 } }, "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0, + "Mode": 1 + } + }, + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } }, - "17": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "18": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0 } @@ -90,9 +101,10 @@ "InLogicalVisibleIndexes": [ 10, 11, - 18 + 12, + 20 ], - "Count": 19, + "Count": 21, "DefaultSize": 35.0 }, "Cols": { @@ -196,15 +208,15 @@ "6,15": "0", "8,1": "项目", "9,1": "%CurrentUser.UserName%", - "13,1": "汇报内容", - "16,1": "*日期请选择工作内容发生日期", - "16,19": "自动生成", - "16,24": "保存" + "14,1": "汇报内容", + "18,1": "*日期请选择工作内容发生日期", + "18,19": "自动生成", + "18,24": "保存" }, "Formulas": { "6,1": "TODAY()-1", "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)", - "18,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "20,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "AttachInfos": { "3,1": { @@ -259,15 +271,29 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!11:12" + "SerializeProperty": "=汇报详情!11:13" }, "Value": false } ], "BreakpointIdentity": "8167542e-2af4-4615-a2bb-340840600120" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "PropertyType": 0, + "Value": true + } + ], + "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "232903d0-69ed-4dbb-a2e9-8018bdf06e6b" + "ID": "466537de-2251-4ce3-bfb5-a1104cc0eb59" }, { "Condition": { @@ -296,15 +322,36 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!10:10,汇报详情!12:12" + "SerializeProperty": "=汇报详情!10:10,汇报详情!12:13" }, "Value": false } ], "BreakpointIdentity": "69737bd2-7e78-4e62-8e4a-00b5d0db7d5b" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "Value": "0" + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "PropertyType": 0, + "Value": false + } + ], + "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "f9e399ee-79d1-4dcf-a8c0-fbf001d3655e" + "ID": "ac19d19e-f531-49e7-8b26-5d4d9922fff1" }, { "Condition": { @@ -333,18 +380,97 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!10:11" + "SerializeProperty": "=汇报详情!10:11,汇报详情!13:13" }, "Value": false } ], "BreakpointIdentity": "aa0a94db-db7f-4ba0-8acb-b42af72400f4" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "Value": "0" + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "PropertyType": 0, + "Value": false + } + ], + "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "50a1728d-2830-4db5-8ff0-358a74ac3ac3" + "ID": "a52a8ae8-5910-481e-876a-107d60fe00d2" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "客户" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!13:13" + }, + "Value": true + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!10:12" + }, + "Value": false + } + ], + "BreakpointIdentity": "aa0a94db-db7f-4ba0-8acb-b42af72400f4" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "Value": "0" + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "PropertyType": 0, + "Value": false + } + ], + "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" + } + ], + "ID": "fb3a4363-6527-409b-b381-6d30b00609df" } ], - "BreakpointIdentity": "ead212ae-198c-4d75-895e-a006e28702e7" + "BreakpointIdentity": "f60ae614-da7a-4ae0-8ff9-4da6b1f7654a" } ], "UIPermissions": [ @@ -374,6 +500,10 @@ { "value": "项目", "label": "项目" + }, + { + "value": "客户", + "label": "客户" } ], "placeholder": "请选择", @@ -641,7 +771,7 @@ "BreakpointIdentity": "ed16f1a8-8987-43d8-84fc-5afa009c2d25" } ], - "ID": "7916cbaf-0fa3-4eff-b632-8046073be482" + "ID": "f8ce66bd-a8d6-4d93-9e9f-fa37601679ab" }, { "CommandList": [ @@ -652,7 +782,7 @@ "BreakpointIdentity": "1c43d097-9222-463f-bee9-202c545bcf64" } ], - "ID": "70a7140a-0720-46cb-b5d2-5c348161c9c2" + "ID": "72c7b181-df2d-4b17-9b72-bb64672acd35" } ], "BreakpointIdentity": "33c73d7d-8935-4b20-9184-6fd9e6147d7d" @@ -1039,7 +1169,7 @@ "BreakpointIdentity": "f495c16c-da05-4352-b452-addefd4cf952" } ], - "ID": "c80ec770-ec81-466e-8c2c-4455d663d420" + "ID": "46d1fd78-da0f-4a83-8cf3-fd8656170fc3" }, { "CommandList": [ @@ -1050,7 +1180,7 @@ "BreakpointIdentity": "872ae3bf-19ac-4250-b1fc-928c312ea04b" } ], - "ID": "52ea2ffc-87b8-4856-82ee-aa3515fcec4f" + "ID": "bac93baa-adf7-484d-b8a4-75ee1cf2f994" } ], "BreakpointIdentity": "cba1093c-44db-41ea-8da3-f59508cd1eb5" @@ -1183,7 +1313,7 @@ "BreakpointIdentity": "7824419c-f986-4a0e-8180-d126e1cec98e" } ], - "ID": "a2558c4d-acae-46c1-b001-2a518a2b5dce" + "ID": "34584c91-f461-47a3-8e11-5fb2e77d2858" }, { "CommandList": [ @@ -1194,7 +1324,7 @@ "BreakpointIdentity": "3684c83b-0d4c-4286-807c-d0d9f60da354" } ], - "ID": "3b95c84a-8e15-4ba4-9b67-a7a0f8ac64bc" + "ID": "38df3607-a8a3-4b3f-b989-6f64346f4fce" } ], "BreakpointIdentity": "0e735ee1-26ce-46d3-bc2a-0fc695259bd3" @@ -1202,7 +1332,156 @@ ] } }, - "14,1": { + "12,1": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象ID", + "GUID": "358110e5-d9cd-41fa-b93c-8428741390d6" + }, + "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": "91a13c1a-5093-4063-a515-4df9e6f8d6d1", + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "ID", + "GUID": "c6f4ff7f-5306-44e3-932c-b131678fae4a" + }, + "ColumnName": "value", + "Alias": "值" + }, + { + "GUID": "67ab6add-3ed5-41dd-819d-ac822ebe7de8", + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "客户名称", + "GUID": "422cec7f-0a68-45d8-abb7-198827696e59" + }, + "ColumnName": "label", + "Alias": "显示文本" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterable": true, + "filterInServer": true, + "filterInServerOptions": { + "defaultMaxOptionsCount": 10, + "maxFilterResultCount": 10, + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + }, + "DataValidationInfo": { + "NumberType": 9, + "ValidateCommand": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "项目" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "BreakpointIdentity": "f5850db3-623a-4719-8799-e3a4b59cac4b" + } + ], + "ID": "285cd05d-72ed-4390-971d-5ac93fbb5986" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "必须指定项目", + "BreakpointIdentity": "470ec1c6-48ec-46c8-8e64-a39b9be7705f" + } + ], + "ID": "ca637455-792c-4531-a7ab-aa67821b12ad" + } + ], + "BreakpointIdentity": "fc8d3f05-267c-430e-a3f3-f8dcf66f1d4a" + } + ] + } + }, + "15,1": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", @@ -1233,10 +1512,10 @@ ], "type": "textarea", "placeholder": "请输入", - "resize": "none" + "resize": "vertical" } }, - "16,19": { + "18,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1345,13 +1624,13 @@ "BreakpointIdentity": "0ecdbd0e-04c0-4631-93e4-6012c3701dfd" } ], - "ID": "567dd782-6d3b-4a5e-8bf2-33de956a447e" + "ID": "68e1ac77-9aff-426d-ae32-5f812b704a57" } ], "BreakpointIdentity": "150dbaac-a064-446b-b2a8-0d14507f00a7" } ], - "ID": "5ae02c3e-84bf-4918-b542-1506c32c493a" + "ID": "b607c496-93bf-4347-8656-be7d7f41e411" } ], "BreakpointIdentity": "be174a27-f92d-4a09-9ffe-5e624b776c8c" @@ -1507,7 +1786,7 @@ "BreakpointIdentity": "bc726692-e2ea-46db-a4b0-7356b00c3bce" } ], - "ID": "fb8bd64b-553f-40ac-b068-8468a438b491" + "ID": "70c871f2-1f35-49a8-8131-ed25da50cc1b" }, { "CommandList": [ @@ -1522,13 +1801,13 @@ "BreakpointIdentity": "f46e0326-37f5-4d74-8b06-10920e4400bf" } ], - "ID": "d72e03dd-3ef7-4cbc-be8d-16ecb933880b" + "ID": "4ba7016e-d1e6-40ff-bdc8-f799d24c97fe" } ], "BreakpointIdentity": "cb2517ef-72f3-488b-935f-310b16253a1f" } ], - "ID": "d1480335-0deb-4a99-bbfb-b659b6770dbc" + "ID": "b20eeaf2-a4d0-4c74-a5f6-e3425dc34c66" }, { "Condition": { @@ -1680,7 +1959,7 @@ "BreakpointIdentity": "01989655-2731-4eba-9998-0d53fd5efd80" } ], - "ID": "955d0635-2f00-4d75-ab4f-ae5a06c3caf8" + "ID": "26696d65-7ebe-4e3d-b7eb-eac7391cd9fa" }, { "CommandList": [ @@ -1695,13 +1974,13 @@ "BreakpointIdentity": "404a5f1a-c783-42cb-91e4-7993bb513f08" } ], - "ID": "38fc6a21-a9cf-41e3-b5fc-c936592739f6" + "ID": "f285f562-5009-49dd-9d2c-1a3af70e6027" } ], "BreakpointIdentity": "dbd01ff4-c038-41a6-a6f9-8080aa35b8a5" } ], - "ID": "9c736195-20c2-41b0-b67a-ed99788d1cfe" + "ID": "8322ed1a-ae51-4aec-8ff4-fcccd08e1654" }, { "CommandList": [ @@ -1717,13 +1996,13 @@ "BreakpointIdentity": "7dcd0cc6-05ea-4cba-a309-7f561dff7f88" } ], - "ID": "7402aee3-e8c4-450e-9043-08bba1524a4c" + "ID": "86572bab-b69b-4aeb-8a55-e8774f4107bd" } ], "BreakpointIdentity": "ba39010e-7c3e-428b-9c66-3159b778119a" } ], - "ID": "aacfa665-c986-49a9-a72c-64c0e5a1692d" + "ID": "c62a2882-2e0e-43d3-9820-0106ebbc5e21" }, { "CommandList": [ @@ -1742,7 +2021,7 @@ "BreakpointIdentity": "7dcd0cc6-05ea-4cba-a309-7f561dff7f88" } ], - "ID": "463a7c0b-6f0b-4b2e-94fb-65368fe5bf30" + "ID": "374e2b29-38e1-40b3-89f0-21ce4ac12600" } ], "BreakpointIdentity": "fa2f02ca-4b8f-4b43-9666-738961bec93c" @@ -1758,7 +2037,7 @@ } } }, - "16,24": { + "18,24": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1836,7 +2115,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "cad34fa4-f9ce-4bff-896f-a40a9e3365f2", + "GUID": "d4437d18-d2ef-4e8a-813b-208e7e8a7541", "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "ID", @@ -1845,7 +2124,7 @@ "ColumnName": "ID" }, { - "GUID": "486351bc-caea-4aa6-a4af-5d23b6499375", + "GUID": "05397ce0-ed4d-4998-9eab-bb1c65181766", "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", @@ -1904,13 +2183,25 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报详情!汇报类型" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象ID", + "GUID": "f7dcffeb-1cbe-4422-bfab-0155cbfce606" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=SWITCH(汇报详情!汇报对象,\"个人\",\"\",\"项目\",汇报详情!项目ID,\"团队\",汇报详情!团队ID,\"客户\",汇报详情!客户ID)" + } } ] }, - "NullFormulaValueQueryPolicy": 0, + "NullFormulaValueQueryPolicy": 2, "TopCount": "1" }, - "ID": "ba45c21d2b854e55ab3c8da8c31b4c3a", + "ID": "c7766de070684dfa8735790fc4e32772", "BreakpointIdentity": "f4a6c98e-7dc0-4159-ad47-8a9ac0cbc725" }, { @@ -1940,7 +2231,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "77c2bceb-7b47-48df-90e7-3737dc2e0a0e" + "GUID": "78adf3bd-357a-4a45-b2b4-29433d70601a" }, "Value": "1" }, @@ -1948,7 +2239,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "266dc664-ca0f-4558-a1b6-6fc8521a295b" + "GUID": "1ae9ed8f-8dd0-403f-9889-ab028920837b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1959,7 +2250,7 @@ "BreakpointIdentity": "834eed75-7dc4-444b-b636-a953a7c025d0" } ], - "ID": "a1c1d9dc-f990-4e05-8b4d-81eb3366837c" + "ID": "b27c806d-8dec-43cd-9674-286cb3c56cf5" }, { "CommandList": [ @@ -2035,7 +2326,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "d473195c-93fb-47e3-8cc5-5cbd193a6b2a" + "GUID": "e850b6fc-c30b-4e7a-a330-05ea9a1e28ff" }, "Value": "1" }, @@ -2043,7 +2334,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "c5a8017a-7463-4f6f-816c-33f04a290f6c" + "GUID": "24b19d3f-b94a-4f55-80f5-a8f290d75295" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2054,7 +2345,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "9e313fea-2c99-4c73-9799-4a75ed502529" + "GUID": "84b63314-dca8-47be-bfb2-5f3172c7875a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2065,7 +2356,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "9541bb18-954e-4800-b42a-86ba5247257e" + "GUID": "ea36fb12-bd84-440b-b9fd-3d273cbc3db9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2076,7 +2367,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "ec958f1b-f54b-4676-984b-3ad35314c918" + "GUID": "0e09e5da-7886-4200-b077-9155f61b7911" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2087,7 +2378,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "36e4d9bb-c12b-4e12-a402-d09eb00a4edf" + "GUID": "7b63bc9f-8857-43da-ad19-409c128b672a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2098,7 +2389,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "a3c55ec5-c6e8-4b13-b028-491ed9217f7d" + "GUID": "8ef96c5a-9bd4-42c5-802b-159a7027dc9e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2109,7 +2400,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "cf592d86-e36e-4a9f-baff-32ee05f3f091" + "GUID": "10d648a6-3f93-407a-9c03-10aba0ef6302" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2120,7 +2411,7 @@ "BreakpointIdentity": "88387dbf-5d84-4f8c-86e8-bd1a77a6182b" } ], - "ID": "a9c8af07-1d93-4de8-a227-8fbde36e4ea0" + "ID": "d3819a0d-a5ef-42c5-8e55-8d6328d7dec9" }, { "CommandList": [ @@ -2129,13 +2420,13 @@ "BreakpointIdentity": "9968f197-62ca-46db-9adf-0de5adb5339e" } ], - "ID": "2e8cf6ab-f7d6-451b-86b8-1fbb33f21ed8" + "ID": "cac06fb4-310e-426f-ba27-92ee961f9189" } ], "BreakpointIdentity": "bb5ee034-6ebe-420a-8d71-441ef7d4eb45" } ], - "ID": "bd715aab-18a7-4714-9450-9dd5ba1a83c0" + "ID": "d57060e0-c629-479c-890f-6413cca81b3e" }, { "CommandList": [ @@ -2146,13 +2437,13 @@ "BreakpointIdentity": "c2885230-b01c-4c41-8842-90ef9241d490" } ], - "ID": "eb8193a4-9062-4ea2-9f1a-34ca6b1eb14c" + "ID": "ef8995a8-ba08-478f-872c-679d3ed2a65d" } ], "BreakpointIdentity": "d7ef6cc5-04c2-4531-9609-718169c3fb3b" } ], - "ID": "efaefe00-ed2d-49fb-8436-6e2a30e44a92" + "ID": "0d957c16-bee2-4f88-80a5-e29da8702a13" } ], "BreakpointIdentity": "a9e4af49-8203-4f00-91bb-f5f0e5f53cb8" @@ -2172,7 +2463,7 @@ "BreakpointIdentity": "26c32013-f929-4c1d-a15e-d74c3e95c2df" } ], - "ID": "48a39f7e-456c-4cce-befb-c1aa09ff6a8d" + "ID": "39351a02-e885-4d1c-b2e4-f0127bf80c0f" }, { "CommandList": [ @@ -2188,13 +2479,13 @@ "BreakpointIdentity": "da6934c4-f141-47d0-96b1-bf826b38e67e" } ], - "ID": "93b5b0c8-081e-413d-ae96-95e67a443485" + "ID": "945f1d8a-7893-4415-a681-4f3e1dde5485" } ], "BreakpointIdentity": "a00a3d93-7bb4-4511-ba6a-024497e618e6" } ], - "ID": "aa36523c-0d35-4aa5-845d-23faf36c38f4" + "ID": "ce0cfa43-83f4-4c85-a896-a4f1f7320c5f" }, { "CommandList": [ @@ -2210,7 +2501,7 @@ "BreakpointIdentity": "608dc433-636a-43b2-a48f-da759c294880" } ], - "ID": "28f6e899-820d-43ab-a72d-1171b2430b88" + "ID": "794ece75-59ec-447b-aaf1-63e9f65de890" } ], "BreakpointIdentity": "51a81760-a97f-415b-88fd-e43ba18c8c10" @@ -2227,7 +2518,7 @@ "IconSize": 14.0 } }, - "18,1": { + "20,1": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "ID", @@ -2286,7 +2577,7 @@ "BreakpointIdentity": "a6205caa-a069-4ca5-8d7c-0eb519024e61" } ], - "ID": "51e80bb4-0907-4707-87ed-f9fe092f6afd" + "ID": "0b422165-1371-4d5e-a1b8-4964c5febe18" } ], "BreakpointIdentity": "4eb021a2-5310-40dc-b013-b66e8be0229e" @@ -2611,58 +2902,115 @@ "11,25": 1, "11,26": 1, "11,27": 1, - "13,1": 3, - "14,1": 1, - "14,28": 1, - "15,2": 2, - "15,3": 2, - "15,4": 2, - "15,5": 2, - "15,6": 2, - "15,7": 2, - "15,8": 2, - "15,9": 2, - "15,10": 2, - "15,11": 2, - "15,12": 2, - "15,13": 2, - "15,14": 2, - "15,15": 2, - "15,16": 2, - "15,17": 2, - "15,18": 2, - "15,19": 2, - "15,20": 2, - "15,21": 2, - "15,22": 2, - "15,23": 2, - "15,24": 2, - "15,25": 2, - "15,26": 1, - "15,27": 1, + "12,0": 1, + "12,1": 7, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 1, + "12,15": 1, + "12,16": 1, + "12,17": 1, + "12,18": 1, + "12,19": 1, + "12,20": 1, + "12,21": 1, + "12,22": 1, + "12,23": 1, + "12,24": 1, + "12,25": 1, + "12,26": 1, + "12,27": 1, + "12,28": 1, + "14,1": 3, + "15,1": 1, "15,28": 1, - "16,1": 8, - "16,19": 0, + "16,1": 1, + "16,2": 1, + "16,3": 1, + "16,4": 1, + "16,5": 1, + "16,6": 1, + "16,7": 1, + "16,8": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,14": 1, + "16,15": 1, + "16,16": 1, + "16,17": 1, + "16,18": 1, + "16,19": 1, "16,20": 1, "16,21": 1, "16,22": 1, "16,23": 1, "16,24": 1, - "18,1": 1, - "18,2": 1, - "18,3": 1, - "18,9": 1, - "18,10": 1, - "18,11": 1, - "18,12": 1, - "18,13": 1, - "18,14": 9, - "18,23": 9, - "18,24": 9, - "18,25": 9, - "18,26": 9, - "18,27": 9, - "18,28": 9 + "16,25": 1, + "16,26": 1, + "16,27": 1, + "16,28": 1, + "17,2": 2, + "17,3": 2, + "17,4": 2, + "17,5": 2, + "17,6": 2, + "17,7": 2, + "17,8": 2, + "17,9": 2, + "17,10": 2, + "17,11": 2, + "17,12": 2, + "17,13": 2, + "17,14": 2, + "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": 2, + "17,25": 2, + "17,26": 1, + "17,27": 1, + "17,28": 1, + "18,1": 8, + "18,19": 0, + "18,20": 1, + "18,21": 1, + "18,22": 1, + "18,23": 1, + "18,24": 1, + "20,1": 1, + "20,2": 1, + "20,3": 1, + "20,9": 1, + "20,10": 1, + "20,11": 1, + "20,12": 1, + "20,13": 1, + "20,14": 9, + "20,23": 9, + "20,24": 9, + "20,25": 9, + "20,26": 9, + "20,27": 9, + "20,28": 9 }, "SheetStyle": { "FontFamily": 0, @@ -2674,13 +3022,14 @@ "9,1,1,27", "10,1,1,27", "11,1,1,27", - "18,1,1,13", + "20,1,1,13", "3,1,1,13", "3,15,1,13", "6,15,1,13", - "16,24,1,4", - "16,19,1,4", - "14,1,1,27" + "18,24,1,4", + "18,19,1,4", + "15,1,2,27", + "12,1,1,27" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2710,7 +3059,7 @@ "CustomNames": [ { "Name": "汇报ID", - "Formula": "汇报详情!$B$19" + "Formula": "汇报详情!$B$21" }, { "Name": "汇报类型", @@ -2734,11 +3083,15 @@ }, { "Name": "内容", - "Formula": "汇报详情!$B$15" + "Formula": "汇报详情!$B$16" }, { "Name": "团队ID", "Formula": "汇报详情!$B$11" + }, + { + "Name": "客户ID", + "Formula": "汇报详情!$B$13" } ] -}//gat3wpLs+95hFxQJzn7pifz5bD1cj+tdODFd0cmv9qPaCyx88apmOVXwT7uQgRFE6C83IdCAsL0m9xcSawTl3uWFl13jCotbS5hZ1cEMR0p3khXSOtCqpJiDeUjWy3djSsLAjJyHQsUDRwJjoy9DqsGTRouA/tmpyCeHjupUa71xdv9tlDKAvOmB5PTf19j0aekQK7u+1gW6rQLRjV6FJ+xzSMXc9jKf26a25aLMXMYgZEN1cU3usONLvzRpbnHJtB7QN9NypRY2lnF5dOHD0Y2Z8OLlyTPd/wSOwrAx+LKGDRDRuptqhCD+1e0lFaIWzVoRYk5gVs1IGGfgLqQFoQYeZX2fg8mzhtXwnCkHOfaVOTd4En2peGC9mkshCS1LXsYzykbELiFhcsMm4qdWn2K4EjW4d2iBqqcPVHtPnLVyZc3rIoYXwJLo4U8zJzgUdKLN5eDl77qlpLFjegsT3MODzDai5Ldbchar4p+NJNKXEmBfePAJXdmstxKQKWTNJxmTh39x1M7IZite9CtrcmWDlukxrS0Ce+fLtIQFVYnl+APdvJ7YIdAfTthgqi2mC3jrI3DPcjl0xpxt2OAhlUHDZStlZzVqlrnYnRkGIjXax4x7/9e0A78UncvVULY7nBhysrPrxxW0cb8IDcR9Ew7eW0vekaWcVUxrKBDmWo4UcHzWHxpcQUNHfc3r5kjcKCAzS2Kdhx1zUsuCdA3jkdf5tjP11IeaLMlpWa9/uoDYXFSPRcN1dnzj3aK+NpKtY4UY2+K/KGMgXkxZBGqwMZRaYI5FiRq6Ff9xSSbvXUxaIl8zSqwq678KhYquFwl7oIgb0P8N9EQwzPz80XJx46JrGz3UTQWXHEscbkfxXMS+YcB3wbcysAREKXj+p7Fa5inxusAa3Me3mKMwyszj6A==|920 \ No newline at end of file +}//dEa5I9WMTgIYc5/CZiBLRyO66+hHakTGQka6J44B1qLu/5tdY2AREhB2mYblp4URh1DX9rmg3f4Fz4SL/w9jesZuW7jnDodUwtDuwYRfN2/Oog+DWneX21Ct7CDAT5neN1ijdkcAjwCp3R0RxLMRW2kCaeSADn6dRNRA/evMq/dVLIhlLCSqDIjDDTavvkGja5icn1ru139UoxfPEBRgDbm8r+8Pi8D20QJBxmldmuFXhnkvA3SNW1E1qC44bYg2DJNgO/6X3u4SkPA1Qa4aU8lvn7mMwOAND58GRvYx00WIbbm7MEv9n7j81rxwNqSguTCwNGiYyusO25xqXZkCRgwV5yhTtmyL1gJUlt4n/iyJnbnuQmOqCWxtjzMpowUG3ZeCnqA3o9wv0T2I1DKdMRm/IqmpFfxa2d5BY806xSDvvMtY2apTgrXKYDUTBZ0swmMNwOe5ZxN9WDJnpVTEkbBEqjTsDFshpMJfpswSPQZV8Ho4yIt9Fe86As3s00T5p0Y85vyYPfWVJnU6opdyP9bkB8aNAmZ2gZj21Q1i/KfkQz14PpGMInuXF/9VXmRYPCjxHl3kFmIiJajBEgSbyM4izP5hCKG+orH4/i3Q/7Z4l8rCWUP9XnEPh71F+GDhRojbkJSw9hBI3jF0zA+ZeJ+fY7/5JmMsdvr5In4RBlBoIo5GwqtO38DY7EpznunD8ULTazPxmf5kM+SQHycgkR5Bf81WipBh2iWEEzgVALAB5aT35Ua1g+SQ7djgAl5gnwvRBzSqKkBvs3JRIoQ8vD7vutKigdLI3hk3zShmgb6Wq2JUUuCkI7nuPKU9bVxeJiu3ubvdSpqtCQQZlchbQfUcbneVZJxi0NgWgFkJoo+yG2B4BzZoL8N2n33h/tXnmxi0+6/TIvfk7XzF69t6Tg==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.rd b/Pages/汇报/汇报详情.rd index 76bf853e..cab1aed3 100644 --- a/Pages/汇报/汇报详情.rd +++ b/Pages/汇报/汇报详情.rd @@ -1,16 +1,16 @@ { "PageType": 0, "ColumnCount": 29, - "RowCount": 19, + "RowCount": 21, "Formulas": { "6,1": "TODAY()-1", "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)", - "18,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "20,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "CustomNames": [ { "Name": "汇报ID", - "Formula": "汇报详情!$B$19" + "Formula": "汇报详情!$B$21" }, { "Name": "汇报类型", @@ -34,11 +34,15 @@ }, { "Name": "内容", - "Formula": "汇报详情!$B$15" + "Formula": "汇报详情!$B$16" }, { "Name": "团队ID", "Formula": "汇报详情!$B$11" + }, + { + "Name": "客户ID", + "Formula": "汇报详情!$B$13" } ] } \ No newline at end of file