From 516babea9e5870b6cdddb3807c55cb08855fa540 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Thu, 31 Oct 2024 15:34:35 +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":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6"}],"Vers?= =?UTF-8?q?ion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 23 +- .../任务容器页面/工时/新增报工.json | 41 +-- ServerCommands/工时/上报实际工时.json | 234 ++++++++++-------- 3 files changed, 157 insertions(+), 141 deletions(-) diff --git a/.collaboration b/.collaboration index e04ba2a8..c048255e 100644 --- a/.collaboration +++ b/.collaboration @@ -526,17 +526,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-31T15:32:38.380828+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1392,16 +1382,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-31T15:33:45.3656475+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/客户", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 8e48cc5d..d7c0f179 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -584,7 +584,7 @@ ] } ], - "ID": "732df9c2-b4ee-4a00-bacb-68361be568dc" + "ID": "1b3a4561-ef22-4f62-982c-b962937e190b" } ] } @@ -763,7 +763,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "16a3236c-be7f-464b-94f7-81a75066edda" + "ID": "04318be6-f4ea-4272-b088-903e30735c60" }, { "CommandList": [ @@ -900,7 +900,7 @@ ] } ], - "ID": "98fb39b5-2d34-4d82-b786-ff773de66b55" + "ID": "207a50b1-cf2a-47b1-b6e7-0ad75b517487" }, { "CommandList": [ @@ -913,7 +913,7 @@ } } ], - "ID": "b250e704-2349-43ab-b79e-931f5a882b78" + "ID": "46e64871-b6f7-4ffa-a560-8ee854b72f84" } ] }, @@ -927,12 +927,12 @@ "Title": "加载中" } ], - "ID": "433a31d0-064a-4846-b3cb-394f83a597c1" + "ID": "4f7b47dc-096b-40c9-a4ce-06137f6c43cb" } ] } ], - "ID": "2daa46ad-1f88-4cdc-bdf9-35c00e5a91ea" + "ID": "fcc81ec9-57d0-4a53-83e5-8960eee734ad" }, { "Condition": { @@ -1105,7 +1105,7 @@ ] } ], - "ID": "2a357101-eef2-4b00-91b2-01229aae92b7" + "ID": "f4d39400-b0d5-4e82-871e-41f43643c495" }, { "CommandList": [ @@ -1114,12 +1114,12 @@ "Message": "无反馈内容" } ], - "ID": "b4fdd394-69e2-4ff3-8569-f55af2a31a02" + "ID": "84467b5b-65e4-4dd2-882d-870f88b12c12" } ] } ], - "ID": "98d2f19e-2df8-413f-8025-76f53014de92" + "ID": "3b443a25-5170-4600-8f82-d83c190340b9" } ] } @@ -1173,12 +1173,12 @@ ] } ], - "ID": "fb54ebe3-d93a-45e8-9007-e83905b2180b" + "ID": "8f3cb736-33a8-4d22-ac7b-e092900f2731" } ] } ], - "ID": "4b66ee27-7fd2-4368-9979-8d49ee3917ad" + "ID": "1c99f0da-a603-46db-b16d-c05308d8f3b2" } ] } @@ -1228,6 +1228,9 @@ "SerializeProperty": "=\"请使用序号+小数点来说明工作内容，例如：\"&CHAR(10)&\"1.xxxxx\"&CHAR(10)&\"2.xxx\"" }, "resize": "vertical" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "27,1": { @@ -1508,7 +1511,7 @@ "ReloadData": true } ], - "ID": "e8b3e226-1e82-461c-be6c-f2e8afc22355" + "ID": "cc44fa8a-95c0-4b33-ad90-09b84fda38dd" }, { "CommandList": [ @@ -1523,12 +1526,12 @@ "BtnText": "知道了" } ], - "ID": "48f45f21-cafd-40d9-bd3a-e57c8676bf04" + "ID": "1fa56e1d-9f66-4b1b-88a1-782b64f0adff" } ] } ], - "ID": "eb68d8d6-b99d-4be7-b89c-a7079aa2070b" + "ID": "ee64cd08-68da-4286-9407-7dc43a619df2" } ] } @@ -1614,7 +1617,7 @@ ] } ], - "ID": "def2d3d0-b835-4f24-b18c-f798769790bf" + "ID": "d401b2ea-ee22-44a0-a3ab-c3b8177e38cc" }, { "CommandList": [ @@ -1629,7 +1632,7 @@ "BtnText": "知道了" } ], - "ID": "af659524-7dac-4f20-b8f7-369e74171375" + "ID": "cbb2d976-c742-41ae-98cd-dfecd830dbbc" } ] } @@ -2086,7 +2089,7 @@ ] } ], - "ID": "3daf9655-ba01-4afa-9629-c158f5286d15" + "ID": "dabc1295-3f3b-49e5-a852-2cbda8f9832c" }, { "CommandList": [ @@ -2103,7 +2106,7 @@ ] } ], - "ID": "15d066da-d9f0-41eb-b635-bead39b11e4e" + "ID": "abc609bd-73b7-43d0-b53b-96577a632651" } ] } @@ -2179,4 +2182,4 @@ "Formula": "新增报工!$I$31" } ] -}//ir5F2dkW/YUb89d3USWIqrYtcg0ZDyiyssNPeMFpxtB2cMngSq1qsW9bcTSfa/b4L+bKCTRrRT/vKWhih2Kou7k+f0yNAb7tFTvBxPs1jTQp7N/isSH8tReanSrA/+vXBAGUBi92HAQg4sLGTq48Zo6ZXy3O99ffB+MRKDPtyhXD2yM1AXpsitZtPNHuSSFbtC2S21uOkfqgGaQWzLCIR10mhuM8BAFk7R8tKgO5KdY7/t0+ad0FGOF4Lgasv0Pswm9++QC1063Ikf6n45c7pG799mDGrt7leVwW/FvPJYgfVM5dUm7M74naLZZTJcA5CSAMoxO2jIolZxxak38tWQnq4JUPk2egdWBC4DiMCiyBGKY351KEus8I7hSAYc7tiyjR0/Qwt8y33AEeXWbQnMN+7McNztc251GXhWIR38nnd6DQ0iptlK8H3sStLHf4QLUIVjTWiKafkiMZDpL6Nz7Ysz5pa8xK+6GDVvV5kumD5pP+7yplhE5Eay6fqGCTedknB6kSWDeQwYl2wJQAAbAqdB89r3HsHjISnD0gWqdyoeVwPpFuFZ0cWd6Dkcl6fzxn4+yAVNRn//TlcHhWj8NtgOU/fhiHQhq3vp8eHOrxr3XovBvKEwZ0CnVWglNw3jXCq6aJKDOX2D5Tz1TF7G1TXHpGC/CmDWsqbqp7UHvqZnnDelqdBThjj/HYqcY7rl7lKsTxGj+tDWcs4Oz1gXw+3lwLVxSMbTflsRYSXJ82MFMUs4SRMbH+AmfOrHInoVAuY5FU/vOy4TBbPo5QlMX5zI4YfbonXZ6yVFpETH3+ePom+nMjPMhvuQydA/aa8vaiRbubYaSGyKGFTD8nGkgNxXGSgeLuh6DNEqKSfLBroCBKACQAgi9DavPjqiM5n5tdSVlueQrmwaxB259nrg==|920 \ No newline at end of file +}//AAwYHwdZasjPVz3hCf2xVPyqgxZYwVareK7lHGLjnYPvaPQTfVHrYdHzWQq0K+L4Af3PSWMj4JC3cjFEEfFfvR2ze/1DS5Wy6k2Naq6wILOKQM+Gsdy5TqgxHTVG0Ih0+wqTaOLwiY/rbXRxTWW8e3P3r5uIFC7CVoJZgmUDB3jwElbagQxmFSCYLEMpLLrMz29DsB1g1gtDHt4vQGOJ9Q3bJMMGY+CxHGLUqbqLFe7K8yAygPcl1SjCsW7ajWl9Cqrbe4CHkyX8gn1cTKGqpjO96o1lsICPi0gEPipmkDdRmjS4BzS5y21+Tl4ZYgO2k6rOJNBk3RhEl3txzcE0nZfqfWyN9yfpZlkRts597Y75XZwDQ1bO5FgJo2UlrDz/0e2QoMHJjoAoVv3ZT7+nEN1E1Xe8D+du29yj0br/QmRP4z7x0u/qzlY8JBJoumsQDrKR7vFMS1EnL/npN5BYkqduSw4Q1/s/KLaT7JPkVpZFHOj7n7Gw51/mv0a3txPCbZUzEwamU0f5vZv/VjEITfouVpNCoeJhgyjQcJg7x1ZaWPiwdBKOjHgwZVkm3MT84w2kFP06/Ig8uH+K++DxQ+bbGwgvnxEiutVddOXRy+2frtxn+HEHcVoit4Uoz0mA2peQsbs4DGFeAsB5JVA6XcThJUaThxHIhubh0IDfFc+xIwAP64iDN65l9yUBRu28G9tBiJnnmM1L3gbkRGhK0GSmRgdVnJfNX1CXcA5hAgOxJ1AeYg3ynK6ZAhIDpg8b4FT/zWfNlETxH3fhquOb4tIGNg3Xzpfi7rgd4Odc6nGtQWDYWeNQ9a9ylVplGDAZlypVAER0gkr82WvvFvzf9shiCsvKueWVW2aSuJmga18OLlMQYbwMb2R/O0ofHf1IXykdDDfut1DzR6O8p1WuHw==|920 \ No newline at end of file diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index cc0a154b..021a9550 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -455,7 +455,7 @@ "ID": "2d719d51ef5a46ee9aa64f113a34cce3" } ], - "ID": "5b60736d-45f9-4a98-8040-8a9d0e4d8046" + "ID": "0e7c91d0-3ab0-4b15-bf5f-0bfff2ac7538" }, { "CommandList": [ @@ -478,7 +478,7 @@ "ID": "11255bb1a556487e972cf64b9d1da58b" } ], - "ID": "ab7e4879-a8f0-4d6d-9c85-d72a60cfc5c4" + "ID": "b342589b-0134-4701-b4b2-7b870a953436" } ] }, @@ -560,7 +560,7 @@ } ], "Comments": "如果是分配到天，就检测当前日期该人员在任务里的计划工时是否够用", - "ID": "c258c8f6-9986-4ff9-b416-2e79231b9476" + "ID": "c160b24b-c2e6-4db9-a440-43c35d1d531e" }, { "CommandList": [ @@ -574,13 +574,13 @@ "ID": "82c651b1c1424340b8c6b3ed1361b1fd" } ], - "ID": "d272daa9-385c-4fb3-8714-cda480a40473" + "ID": "9866a39c-3669-4a47-89af-758c3881b889" } ] } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "15f7d9f3-b957-45a9-aa3a-f1a14b968ea0" + "ID": "4b7900b1-2826-42f8-8602-969ed0333013" }, { "CommandList": [ @@ -594,84 +594,116 @@ "ID": "3f324a9712e14a6693472fa215c3143f" } ], - "ID": "b87fe06d-b8df-42bc-abd3-7084cd5465b0" + "ID": "6eb80817-e815-42b0-a5b2-3424c0492a5d" } ] }, { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "Operation": 17, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=CHAR(10)&CHAR(13)" - }, - "OperationParamaterBName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - }, - "OutParamaterName": "进展内容拆分数组" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "OutParamaterName": "新内容数组" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容拆分数组" - }, - "LoopItemParamName": "进展内容item" - }, - "CommandList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "$type": "GETPOST.正则类.正则_取匹配文本, GETPOST", - "JieShouMsg": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容item" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + "value": "%Null%", + "compareType": 1 }, - "JieShouMsg2": "^[^\\S\\r\\n]*[\\d]*[、.\\-]?[^\\S\\r\\n]*", - "FanHuiMsg": "取无用符号" + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "Operation": 17, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=CHAR(10)&CHAR(13)" + }, + "OperationParamaterBName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + }, + "OutParamaterName": "进展内容拆分数组" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "新内容数组" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容拆分数组" + }, + "LoopItemParamName": "进展内容item" + }, + "CommandList": [ + { + "$type": "GETPOST.正则类.正则_取匹配文本, GETPOST", + "JieShouMsg": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容item" + }, + "JieShouMsg2": "^[^\\S\\r\\n]*[\\d]*[、.\\-]?[^\\S\\r\\n]*", + "FanHuiMsg": "取无用符号" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "新进展内容行", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=SUBSTITUTE(进展内容item,取无用符号,\" - \")" + }, + "ID": "20472572ee904f20a1ea7c5f32683622" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新内容数组" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新进展内容行" + }, + "OutParamaterName": "新内容数组" + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新内容数组" + }, + "Operation": 16, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=CHAR(10)" + }, + "OutParamaterName": "新内容" + } + ], + "ID": "5bd2e474-b38b-411e-bba2-358d75dfa6bd" }, { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "新进展内容行", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=SUBSTITUTE(进展内容item,取无用符号,\" - \")" - }, - "ID": "20472572ee904f20a1ea7c5f32683622" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新内容数组" - }, - "Operation": 4, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新进展内容行" - }, - "OutParamaterName": "新内容数组" + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "新内容", + "ID": "6d592b1c11a440eca4cce1c308f09b8c" + } + ], + "ID": "7770c7d7-e0fa-4939-b1a3-5721cad9b16a" } ] }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新内容数组" - }, - "Operation": 16, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=CHAR(10)" - }, - "OutParamaterName": "新内容" - }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", "CommandList": [ @@ -685,7 +717,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "0f4e16c5-9bdc-4adc-a9de-fef475690b68" + "GUID": "b724680f-776e-4e54-91a2-c9297e4bedcd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -696,7 +728,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "a5934eea-82eb-49b8-b015-b6da1439a5df" + "GUID": "7adeae26-15d9-4e7a-b8a3-2f8be012540b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -707,7 +739,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "3fd626c5-ce88-4893-9ef4-e3270ed970e1" + "GUID": "2dd639be-112f-42c8-a352-e565512a5187" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -718,7 +750,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "6600c0a6-85e4-402f-85ae-c27d9cdf380a" + "GUID": "9e61b98c-6940-40d8-b4a1-e5af68294e70" }, "Value": "实际" }, @@ -726,7 +758,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "68d08e51-3d2d-439b-bb51-d8d580eab964" + "GUID": "64719746-55a7-4b74-b6e3-a07b5998d005" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -737,7 +769,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "912d6a22-9f2b-40ea-81a0-9b50f8528c26" + "GUID": "e95185d4-dcba-46ca-8e3d-2787fe91b3dc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -748,7 +780,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "51d2ceba-2831-4ca9-be9d-11614a741fb8" + "GUID": "125448ba-e749-4137-a64f-3e4c18cc11a9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -759,7 +791,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "b4ab089f-734d-4a7a-8907-007d1f984b2f" + "GUID": "11939523-4632-48d8-a827-2b178bed5f60" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -770,7 +802,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "54418511-ce0f-460e-a0f7-bdc2047c5491" + "GUID": "79a41e14-30fc-4903-bdc2-e81252ae3f51" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -781,7 +813,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "aec753ae-d03d-48d7-9792-c3a61e5a8e6c" + "GUID": "f7029413-87fa-4cdd-87d4-67773b9ac600" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -792,7 +824,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "37c4bbac-d9a0-4c9c-b3d7-2a5c48d7a0fe" + "GUID": "8e577bf2-9f96-49d1-9e6a-50f0d2ac3882" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -844,7 +876,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "abdb8a3b-0224-46b4-87a7-bf23bd2eca8d" + "GUID": "cae2c58a-e0a4-4ebd-a9de-f8f20b234768" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -855,7 +887,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "d125eaf0-d897-4221-9a3b-6788a7b69416" + "GUID": "04dacea9-1c73-4eef-a5ab-4f90d1dee383" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -866,7 +898,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "78fd7bcb-f094-4e2b-96f2-7a1cbc343195" + "GUID": "37c13de2-4404-4ea8-9c6a-cd4fed18e2b1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -877,7 +909,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "85c19113-b8ea-4fda-bb10-176346c40738" + "GUID": "fd8fd7be-9be0-4d45-b4f3-76778e8b2e60" }, "Value": "计划" }, @@ -885,7 +917,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "1c71172a-ca87-4122-b8a9-b0a2309364ce" + "GUID": "d1f053d3-3835-4bf3-98cc-c5e94300cd35" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -896,7 +928,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "4a675b98-438d-4e63-b474-11c60ffbe600" + "GUID": "bcb2e10f-0798-48f8-a95e-7787ce15cfb1" }, "Value": "系统自动生成对应计划，保证任务可分配工时" }, @@ -904,7 +936,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "805ba35f-642a-4731-8104-e0b35188dc43" + "GUID": "3646e75b-cdcc-4166-9fdd-9dca98aa9101" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -915,7 +947,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "c2825b07-08dc-4c7d-b91d-1e8f2fa05013" + "GUID": "f166c286-6753-489a-b204-7ac19c5394c3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -926,7 +958,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "a53fafaa-3b2b-4f2b-bd6d-29460279954c" + "GUID": "94941dbf-8f4c-4081-896b-6ebf68b70c25" }, "Value": "0" }, @@ -934,7 +966,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "93933002-d8c4-40bb-9bfd-08c6983dafae" + "GUID": "26bd30ab-af9a-45a4-8f4d-8bfc7e71618b" }, "Value": "0" }, @@ -942,7 +974,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "f27ee3f0-a505-4722-92f8-0921f1cd2211" + "GUID": "b16bb597-1aff-47aa-a254-92d2e1eeefa7" } } ], @@ -950,7 +982,7 @@ } ], "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "51f81352-af6f-4a77-8674-5eef8aa45b73" + "ID": "ef6ff6ff-e6ce-4080-a2d9-dc39a0d0ac13" } ], "Disabled": true @@ -976,7 +1008,7 @@ "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "c963de63-7574-4716-90a2-21b394f3ed01" + "ID": "b3961c6a-a6e4-4f5c-8a97-eaf3c4f56e97" }, { "CommandList": [ @@ -989,7 +1021,7 @@ } } ], - "ID": "d4d82229-a7fc-42f8-9c8b-31cc24fe86ca" + "ID": "78e37875-ccf2-4f92-b8b9-e96a4bae4705" } ] } @@ -1049,7 +1081,7 @@ "Message": "报工成功" } ], - "ID": "7f9764bc-0fbb-4930-a5ec-67f3ab1e60c0" + "ID": "0f7b0034-b07b-49a2-b1d8-7e60dd6046e4" }, { "CommandList": [ @@ -1065,12 +1097,12 @@ } } ], - "ID": "7ba3bdbe-02f2-4280-bea7-498f26ea4cf8" + "ID": "466223b5-0e71-488c-ad53-43acfe316288" } ] } ], - "ID": "cbfaeab0-9778-4e00-b6c2-1e38411cc0e9" + "ID": "9cd6e16a-70f9-49d3-b871-15d0685b45a1" }, { "CommandList": [ @@ -1083,7 +1115,7 @@ } } ], - "ID": "e4365ede-cb1b-4b90-863f-2d74a03832cb" + "ID": "2a1e5892-cc59-4446-af64-3c0b76785f7f" } ] }