From 564a19e1a9da99b39092e2e7da7f05542a43b7ba Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 6 Sep 2024 11:11:29 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=86=E8=8A=82","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":30,"Name":"TableProcessView/ACT=5FHI=5FPROCINST=5FVi?= =?UTF-8?q?ew"},{"State":1,"Type":1,"Name":"PCPage/=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=94=B3=E8=AF=B7=E5=8D=95"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 23 +------ Pages/收益/审批结算申请单.json | 64 +++++++------------ Tables/流程表文件夹/ACT_HI_PROCINST_View.json | 2 +- 3 files changed, 26 insertions(+), 63 deletions(-) diff --git a/.collaboration b/.collaboration index 99e9fc33..6031f7d9 100644 --- a/.collaboration +++ b/.collaboration @@ -106,16 +106,7 @@ }, { "ModuleName": "TableProcessView/ACT_HI_PROCINST_View", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-06T11:07:41.4478519+08:00", - "ModuleType": 30, - "ToRemoveFiles": [ - "Tables\\流程表文件夹\\ACT_HI_PROCINST_View.json" - ] + "ModuleType": 30 }, { "ModuleName": "Tables/工时", @@ -839,17 +830,7 @@ }, { "ModuleName": "PCPage/审批结算申请单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-06T11:02:58.8585477+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\审批结算申请单.json", - "Pages\\收益\\审批结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/办理结算审批单", diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json index f485b414..08cc961f 100644 --- a/Pages/收益/审批结算申请单.json +++ b/Pages/收益/审批结算申请单.json @@ -247,7 +247,7 @@ "MethodName": "Refresh" } ], - "ID": "c24afd7a-06bc-47a9-bf35-7e941cbe9310" + "ID": "2b8c3317-5a5a-44d1-9c40-ba3937433181" }, { "CommandList": [ @@ -255,7 +255,7 @@ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" } ], - "ID": "c6a809df-e73a-4ae7-9e25-ada313c76579" + "ID": "2bae7b80-9030-4b72-9940-c9f5aa76f399" } ] } @@ -370,7 +370,7 @@ "ReloadData": true } ], - "ID": "e313d36a-18ed-4be3-9682-79ae79f351d6" + "ID": "0e9ac967-e7bf-48e2-b881-f7922e55c6c8" }, { "CommandList": [ @@ -383,12 +383,12 @@ } } ], - "ID": "3fb794a7-ba68-451b-a31a-e72c5e110d4d" + "ID": "5d5cba86-18ca-41f8-9c54-3922f1f5300c" } ] } ], - "ID": "ed04a467-52ab-4dd2-aaa1-ac3ec126233e" + "ID": "4b71d0f7-0c62-4210-9873-f360249591fd" }, { "CommandList": [ @@ -398,7 +398,7 @@ "Message": "请先终止请款单流程" } ], - "ID": "951e8239-22e2-4823-820e-43278561faff" + "ID": "c383dea1-3b8c-43fe-a89f-8fc2d49837bb" } ] } @@ -1212,35 +1212,17 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "40757848-15c0-4d75-943d-190f5232b23f" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=审批结算申请单!K18" - } - ] - }, - "value": "%Null%", - "compareType": 1 - } - ] + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=审批结算申请单!K18" + } + ] + }, + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { @@ -1266,9 +1248,9 @@ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "ACT_HI_TASKINST_View", + "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_INST_ID_", - "GUID": "8e797521-e9be-4308-8f81-38f5de12a2f5" + "GUID": "ca6955da-96e0-4f74-963e-93e4cfdcd578" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1278,9 +1260,9 @@ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "ACT_HI_TASKINST_View", + "TableName": "ACT_RU_TASK_View", "ColumnName": "ASSIGNEE_", - "GUID": "84e050d8-69dd-48c6-8e64-6405d4a060d5" + "GUID": "3c6184ba-8b78-4ca4-a380-fabdf2b6de99" }, "Value": "%CurrentUser.UserName%" } @@ -1288,7 +1270,7 @@ } } ], - "ID": "eead7797-4937-41ee-aea3-40861ac13697" + "ID": "edee7f68-63c9-412e-917a-0bbc6cced104" } ] } @@ -1651,4 +1633,4 @@ "Formula": "审批结算申请单!$F$18" } ] -}//TtVjXc377X+/Kmeq3qBVZf5EhUyIJ/cX3hl3QtLIv6PJI/hrA47TKbpXjsqY40rWcwtsgjMv1lwcfh4ZrJEfXMCGrypM70OhOCFIra9QJ/ovNfrochtFVNz5VnDKhhq3RIjNWH+p39KBMec6rnTIR56ahLTVS0amNn3gvHTFPoajSQN0BGjj7t334bq45sRjLRuge6eBSNQIFliiU8fjvU0h5BXOQCiqSOrYSMNr29BnfxBgppD8O2NcOsvfr/ND21nqzRf2bI5E6BF4Hry4TsVSV3BVRxO0NKGoWMUS/R1PaUKLR5a5+b19UibVfX3HCJjRW3tOmRFsnNtERRZitMGeREskDIH+JGxaeHj8Bt7ee7LMY/x+DR6o2cxaLyCrCJfnKpzdeMqvuZZGNN/jr6VCXV2zarmBUW0HW3D4KvhlkBnQH1/mShTt4HugjiLSFO0kdyJnF9ja8ldbTKxqPnjdZ8MuoZHWeycLWhDugGXyTGWV55PH9dRLX0uH77C5JobWzdtmzO9cl444cTmZPP2LM60DoA26uZeFEY0juprE+/kb6GmtGuzUI6FRVjJSeb/3PZk7mmDEspdy9Cv/+sx2oJR833FLAqIhzdK4zpt1RYkbM93oaQXqWSrL0rcHbrAyW+dpH4vQBNV95hmIyOZsfVZlDRtqqqWEh868g/V9kv4IdYVmjPGGcuXaegc7ci8+0DH6qvoXbGsNKIlsUehd6zKbSQVpgOWJ4ZVgjiL8ppsoP5rOOCBrQwudKN1cmdbtjaz74iZvEMF8wC1bQjZg6HOjGszFqBntSzWiVuCA6r0odpWUVJ5ev4P6kA2rTgpW79PZo+LE5iMBikazMDSHlVnsl/w3bqaE68pwjPzny0JS8zxcDsMBhZZlhWsdDGmYsWak3loRSFU8eeaCGA==|920 \ No newline at end of file +}//92QzDgxiNew0/Q1R7mJDNf0iSjnOGI4f6xaSefwrBpTCye8AUeQqT9HXmQDV4h3Cgc9oYK7tGBNqWPnGVAQD5nHX5jWMRyI/efa7hh9U6M0dhgShmL986fZaMbn0ho/wVApUS35vaD9SG4AXznphQ1U4uPXQHZ/QKBULzW74+Wi9oiTQ6O92YizuRLQX+WgnPRpSiXOneLzaE/+pA3xwuX4uGr5i7tg/As4K0iMzF6DgnQsFViAFF2u+8b9M1IG+TcZFFyZ+9JJfCbJ+o+hP5yB3zHfuaoIBtyHST6cVvZpCAnMMJY5I+20aMyQawkJtce0zwLv7Iqr2YQjn4A9mdbV0IS1LGHB4jXwZKfMHEIeZw14PERMjb5pidpXVmLZ0N4u0I4Cge+D6ao6wHkqGifDJoNZ2ynM9alkiBQumle/t+eFOUxEFdPt/A5sdwVWshCzP/wqxgWeXKmD0KJn0+R12iTFwk78FpPEJ12VPz6Q2CMJRNrlu1zo3qFmYFdfYozt+1tSkIKb4NIIbKFGUmU2BZmQH0h1FZJCbfaiP4AGwAnmH+KnwgjdOLq0yQxzs30TzgPZ0662WAJXfLv919NyOjWQ832QknTyiVAqc1qxV9D2yOX0edJ3PgmTSa+MtKWpwnvKZBvu/KG8cIC+TJlBKmMXis37YHoPAf6ibPQZi55Z/r33w3HUSjMTaY1JYlAth0pEQmyqtr7urbnbBt61sop3WBj/AOANHiYCpGBnSVgtFeOsiWVTYbCQuxpzOeT9OtRITv6DC/u58iiCebh81nXIrTKwGa1xGfhOSicvwr5gKnRhs9eyUtm6WWmQYp5CnpqHpzV3suE4HhFv5ymU+7jIZKHo9VgxPy/3xC5tc0/efZaDgkqTT5SWlBWAIi9s/mwIiulMEaWLzcviNlw==|920 \ No newline at end of file diff --git a/Tables/流程表文件夹/ACT_HI_PROCINST_View.json b/Tables/流程表文件夹/ACT_HI_PROCINST_View.json index 42686882..7c71adb8 100644 --- a/Tables/流程表文件夹/ACT_HI_PROCINST_View.json +++ b/Tables/流程表文件夹/ACT_HI_PROCINST_View.json @@ -4,7 +4,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", "permissionResource": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", - "enabledTypes": 3, + "enabledTypes": 1, "isCreateRecordHidden": true, "isBpmProcessView": true, "isView": true,