diff --git a/.collaboration b/.collaboration index ebd13f86..5b02205b 100644 --- a/.collaboration +++ b/.collaboration @@ -684,17 +684,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "DESKTOP-P7DCA12\\ZhuanZ", - "Email": "269252963@qq.com" - }, - "LockDateTime": "2024-06-25T16:36:51.127952+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -2372,12 +2362,6 @@ }, { "ModuleName": "ServerCommand/服务端命令4", - "State": 3, - "LockedBy": { - "UserName": "DESKTOP-P7DCA12\\ZhuanZ", - "Email": "269252963@qq.com" - }, - "LockDateTime": "2024-06-25T16:38:32.4304177+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 482e1bcc..925cfec0 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -516,12 +516,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "94ba8b77-317c-4618-99fd-ca3e0a7a78bb" + "ID": "ad5754db-0cd6-411c-ae54-d76dc01047a6" } ] } ], - "ID": "f3de4723-2195-4e11-af83-dd71445fdd1f" + "ID": "29f3f6de-d59d-419c-936a-3d2a7ebcd669" }, { "Condition": { @@ -547,7 +547,7 @@ "MethodName": "Refresh" } ], - "ID": "51cb4113-a961-436f-afb9-8b6fc4f30c6a" + "ID": "83797b80-ae2f-42bc-88c7-3eeaedba6d2f" } ] } @@ -1579,7 +1579,6 @@ "2,34": 5, "3,4": 7, "3,20": 8, - "3,21": 0, "3,22": 0, "3,23": 0, "3,24": 0, @@ -1939,4 +1938,4 @@ "Formula": "项目审批!$I$21" } ] -}//Vgi8FmgAea9WdnSQU8i0GvR44CZLtZ9BxAiVzhbw0v62mcoGrDDZhRXtoWxwRVeCDaD4WER2X4msnU1hWhJimbrV61iYWTSdR6VBZnI3TWlXaUfgn8F5OPxewvr2Vq1JRpEsdSuvcO/i0qoai/n7hrK6s+RlsnQ87UYzGpmFfELqqWHvjrFvCl4fOaze9iSk1UDzvqdQi5IK0XBXFkIZareVZf+Q1rKaL9wZBmrQfkL/ZkEhtBJGaMgtQ3fPmNlrwOx/cWYq35mX8KiKJt+xC7cVHeJ/l60Pl6I2Et7GWlm3v5J1l9xthDAFK6Xv0DURtTuybEPkfKxejOPdUkY+G0/66SJxA38lQKGqkXDIcKuIPb3UP3M4X7J3cNQ6uVitbSmzMN4HIrDuvcgqHooI0n9vmYHX9FQsmJlL8dO3V9bY71SaQgl1YV+dfEVF24JFXhE6GRckvOoYvg8qrPiyo6MwnLywrnYwkoPWJaUV7IZOsileyDjXVFL6WV125I2UyUQC3TDJKjOfSK7yks/hR9pKIJ7XsTkJtnCeCnXlRGzLu43T/hdd3Ew1f+aedZvJoZKnkyJquBbgrbR76ARIVfjI8QcMLc7tmhWBOPUywR1txLX2HzFIcbm0+XHtVd4oKQWQZJNUkyaWtaTbRVyOfbTotpOaCpFR/43V1h02mDSZrzRTaHX08PVksBvRNiWmamy1F3dovAp1l4BFKMB/qy1oHvWhx3M68ebA4yUhdq5rqpewigiraFnmTpOE6DzgA/HnywpAmFzhhrgxpfZnYuh/Ehi0q++YGt2a9jI8+sYhzB1vmhoByHTGYOIjdJPhZKdj6sOgtUHgMRuUg3PZzgKN+ZHQ1fV3Q2zX/JW7ufwN1qfqwK7rrjSMUSxmlfeT9DnRLe589wS/PBVlF5rhyQ==|920 \ No newline at end of file +}//fhwKhOf6AzP3McqWxm8GizVX86NftW/U/BwUx2hzryMzXoSENhJs+SZtGP5ILem1H+J07FQMZDSFbdBQSTJ/bUZ1QsNYeFtozpq3fO67yy7yEA2fp5ZuECGoilu2r4OoyejSvYK0MaUskrc6BRj2amLMO3dgubuCNmHCpjy9lr6obIq4kbrApaz7cLiHNTvGALvdNrfSR035ik/lixtydvQ3DqcLV/iGSKGY+TVD1t3aAC9VUuziAre2b27hBqSuG+IzHrgYTxN7eEWACE2U0mQ37NEmWDjKJJaH9OIGZ7bC2J1uELBgem3P0VEN+9d6JiO080r1Su5GrE9cInRF7va9YCOlY6rXCbL0o1vtiBcKXWoWfvVY2re9ZEVwm2zWjGK40QeAxI1OwXlptUYIZJ6dnlrOVAWIiZIo4o81j98+FVYTRZmzeLWE0lcc+3a5fMU65mrG47aj7Koul9gT/JyjsGllG/WGUMINK14bDZaob2Bce2rigFvIQ6T8VKiVCRrkstVpqutXKSBRKSORkddlx4EgQNmoLGotutxVIPVWKENsMC5i2wI6/eiQJrKiiOj102hihvr6dq0yBl1gjsc2yhl18cWZ3gW+X0BT2WrtE2bMzMqZGpSlT1j9etbrb0JBdOhq9UssTnl9F6pXHhPqvh4/OtHs5CVxV9LOvTT2PCcis4L0forMKR5XkMQBsuKja9kqxXRB6LXLw5hWM8EDUWWjhW9A4NUqU/+BVLR1HHmCuMDtozQd9Fc57WAPMddq7NiYZ8Fl/IT7zvZGBOHFFGQrE4NkrI94J2/jtfr6kB7VrV6jyFTUG99qS+qrUV98lk5AsJklh0jhhmQnrVZlHhUw4V5oAvCZDouI7E2FQTRVaYpC3mU7mcrXwX+cTlv+rtBS7Nb8MIs68DZ4cw==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index 39e40a9e..6c890be0 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -1,16 +1,16 @@ -{ - "PageType": 0, - "ColumnCount": 37, - "RowCount": 21, - "Formulas": { - "1,33": "IF(C21,H21,G21)", - "12,27": "DATEDIF(F13,Q13,\"d\")", - "8,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F9),\"null\",F9)&\"&$top=1\"),\"\")" - }, - "CustomNames": [ - { - "Name": "项目ID", - "Formula": "项目审批!$I$21" - } - ] +{ + "PageType": 0, + "ColumnCount": 37, + "RowCount": 21, + "Formulas": { + "1,33": "IF(C21,H21,G21)", + "12,27": "DATEDIF(F13,Q13,\"d\")", + "8,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F9),\"null\",F9)&\"&$top=1\"),\"\")" + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目审批!$I$21" + } + ] } \ No newline at end of file