diff --git a/.collaboration b/.collaboration index 7adc76bc..5d87fbed 100644 --- a/.collaboration +++ b/.collaboration @@ -722,17 +722,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-30T10:17:59.6007844+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 54478c57..31829545 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -505,12 +505,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "0918c6db-93d3-4c95-bb73-6f36b71f967d" + "ID": "8408cdda-de9c-4fad-b34b-ec2025b0f6d1" } ] } ], - "ID": "c4cf75ee-38ae-442f-beb4-8d0e07f4b8fc" + "ID": "e2bc0067-681c-4c09-a304-5cf6cf880a60" }, { "Condition": { @@ -536,7 +536,7 @@ "MethodName": "Refresh" } ], - "ID": "fba02c77-bd9c-42f1-950b-9c46e6ee62f8" + "ID": "2e76e1f8-4d5a-48d9-b441-1b66ca5c8774" } ] } @@ -1091,17 +1091,32 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目审批!F11" - } - ] - }, - "value": "%Null%", - "compareType": 1 + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目审批!F11" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + } + ] }, "CommandList": [ { @@ -1129,7 +1144,7 @@ ] } ], - "ID": "b651202c-4278-420b-b43f-306a96c4ac95" + "ID": "bd351911-70b4-4bb1-9114-3cfdf4b98b4c" } ] } @@ -1802,7 +1817,7 @@ } } ], - "ID": "87904a2d-f753-4a95-9162-7da2c7342ad8" + "ID": "8bcd05db-2a98-4e4a-ab37-3881413b1660" } ] } @@ -2399,7 +2414,7 @@ } } ], - "ID": "e08053f6-6125-48fc-b23c-3815bfe89954" + "ID": "726cd41d-fd53-4f68-a2b3-c6207c8d2e4b" } ] } @@ -2436,4 +2451,4 @@ "Formula": "项目审批!$L$23" } ] -}//D019jqVcbVAMyf/TLFjsmUIYB00So2kOaowddJmqQDXSCjImix4urlQnXKOf6xJTRObH7INfw3XzQdwFdCxjujVeZ2RXtVu659fe22LS352x6k3ZREDvPJrwwEX5iVqZxikabULtRa7Zx8ZqWV7DWn5J+hTaSiZp19/KuVMEePiePKeDR27IbsvyFDV7+DQIn8ocyUfs0vVSMya/g5NKcgAt5oD+uk6c9FhMXO+BXimU5uPbojpTMyPY8kPjYFdpRe/Sm1bADQeIZLkULbs2ia1gPEWGjWRqw21errCHqJ2gbAoPRHQC/mHnlI6u4mXZLtQW2ixvd5gKPCrL724MmZUZjp6iglVjEWs552mBe19s0+o/5lrLnrAbVTIl7qkNeFums4jQ3AleZuMYNGcYKPT7uywIdWEj0/srrlVGtfGj9elX5kmxfBBrMFGWDNLp+I0drckTVwHlwl5qWoAeUfHBRM/Zvu/+FFHaXdaDTwe6Hv5KbFADjDlSZfuCsQhyc3d5+2gYDS4agvAbUazJH06r4j15HxFTM0a9ts0Z1dom6WbbrE0FT1of5WCwfv+nF80/hGPOptexlxKxk2JiUPm3m+zVAA+TwX66379i92c6G1Izc0UHyIjoIrWYb62r846mzsIVhxPAy3119vXDrb9F1X3BfsPogqskS130JuqbUQGbOVBHSD0DqmYPp9zLnwBASBeKDybsYoTba0bDUdn2jccCqwKC7bF33sxxKsjMuLXoXJoKZzb0UN48ztG4FgfTP0Y+58IXw/y/3neLsEoIJ+u/m7gjQH2L6uaSymuGrs5T4coGrPsLEI8YXJfIyplLf1fVJlhNwx1RWZoS5ovRMoN0ACtw6DdlpTCJ66JvHJhAxlwaTeAuDKhlBPXUULXoSUkxlmYLUI33EnL4Pw==|920 \ No newline at end of file +}//3ZIalEA4yRB5q57fdx8Pa9U+1SiheVDOJCGv7FeGPpkAmf7BfSlKgmz5grM9ZgePRKn+M12xl4sEgOrTiRyL1yfxvlkW3Ccx8ZruP3g2qFHOEj87Ks9LHybf9tXxQaK4BO0DOsOY1PwdODhcl6w5mc0AfvyjFyAJF1mwuVmXeLspluGGp8iWnS67J2YpmQ3wLLGAYjWDcjLDJWV+ye21/G+P5Xwz4tLGdmJ4ugs1ZEBa7M8XVPWVQ4wCGFzpFYiH2r2jPKHKrvlqzrB+B3Ox4se5VoR0DagYrggc49MQm2JNtq6ocVv3NVkEveYT45u4LjHlR2Y0ZTwRZhefpfTVR1SodrEMF3C/gFwXLYzGgIfcfZMnOkX1HZcSOyl2JS+VIPUC1C0erAoumF2K/8ey1vefZG57zj9NiDhAIFsmWTQmzkQFHrbHne+LFC2BTV5cRiYJrY4JtJEcSoYJ5GSJddmyAHq2CG1bvn2DCXSgvxQmuwT8suRRZBmtvpU5HWdqCfo+NFPR/pW5sBkTNg63p+M5SmQY9EF6inffOsymQIsWfbuTrfA/uZoehn6ML8ZwYwjttU6fP+FFI80v5mq9bW+mti2NyDtZNgX/TGsueJgZnfbeHfl9hhKmGQF//LNBPsvWCFZ4fOkL6C812ppgll82x+7OwzFHAT0RRlQa8WOkAcSp24Jfkg4HvrWwoUMkDuaL6/5bTvYHdW0C3wXd3Tis27HzZBgXSCPKWTHEJp4ETS76IvDAE9WGQo1KgLQ5tdzWv1gAWk+jcUif7B8GMAzyg+RodTG9l/uCUP5tQpFJEAZIIkiiCqN7GWHjvnOTPnpyHCIOQacxNS6YVK/O80Ah3oxN2P4DXaaTNEYoMTbyfwx0H7ZIfM7IiEz3F09Nxche3js4+jQJHQdrg62IBA==|920 \ No newline at end of file