diff --git a/.collaboration b/.collaboration index 0c73f502..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -446,17 +446,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:41:07.6939038+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/反馈与建议", @@ -588,17 +578,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:51:15.9300264+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -614,19 +594,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:48:00.6274456+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷子页面", @@ -738,17 +706,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:47:26.4787708+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", @@ -764,17 +722,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:43:31.9650912+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", @@ -1730,17 +1678,7 @@ }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-13T09:39:41.1705282+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index bd1b7266..0c10f585 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ ] } ], - "ID": "83a0a91c-5f2a-4798-9950-2bf43b00af90" + "ID": "772126d7-a8b0-4960-a735-f0020c4069a1" } ] } @@ -228,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "9989cdc8-8dba-4bca-b66d-73cd93808bbd" + "ID": "d4481e9f-aa28-49d5-bb32-9e6bbb90c13e" }, { "Condition": { @@ -258,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "ca83b404-77c4-41aa-b0aa-012c71b9423f" + "ID": "014d89b8-3795-4296-ab09-2c97fad07dc4" }, { "Condition": { @@ -335,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "1013cfa3-f7dc-4c07-8150-05908a3021ea" + "ID": "bfa54a00-2b6a-48b6-8acc-8cc886b5d9d8" }, { "CommandList": [ @@ -350,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "d15b4f31-4a1c-4ae0-bbbc-f8b848f8d039" + "ID": "2eb08750-4681-4dda-9fc7-aa2bff031344" } ] } ], - "ID": "aa9ec617-2b2b-44ac-a2c9-2c8bedc60467" + "ID": "2f4d21bb-7e38-4635-8f6d-2a4c2be89faa" } ] } ], - "ID": "9e7ab1d9-3dcd-4cce-b619-f358941a0178" + "ID": "4c3d293c-08b9-4863-a18e-443675ea3f08" } ] } @@ -455,4 +455,4 @@ "Size": "24,24" } ] -}//kKoy49Xyq+lEnX6BR+o/JGCXp4fAxVfPV7G92bYHRc8FucUtS3aeIEzcvnp4+nSRa0uksnn37pzzXSKrLXoBJUp4cvxor3Ond2HWJcPxaLTRroVHeFhGRrUjMnpunSb7LjQjXTFEVjjdaa/QoLYLZlU754WBeVGlP+HzIT7yYm49vSNW2tEryUhS4evBamwg4CAkQQVqJ0lUhvIFjI1N+NXv2IJGTNDkc9lVdtaZjy4W4/vvxNRWdJxU1bA3b24Jrp75mpzJlSmX7Gu+ZoEmJXxQPObhRL7rICZyTz1kHXums/cdtfqlUEQ7UzzSmvSFXAWL0VWJ+6py4RAZATPTNKn0+nlc2MdzJA3DBVa/8XWtkICwJ5vOfPHH61SWbbtD1iK6EOzqLuQGJB5kATLT1alX/sc62afGPEE0pVXmSu6Y4DXQIbWfeETh1Y7o3Zx+UCDq+mKVGQuXXnzwDyUS66GlYaVBxFuE2cwDgrra9FffV7Bs3gOcShm15lDTA7COQoLKerIaix8m3+RRy5mkC35gtfoTJmFmQ1xsgIVKlTR7wvGMEhax9NumL8xGEGXLLWgBg6fMF5Q9zzCZbafZc0E6G8t6FpW0QpZ3+UONaDQXXj7FN31bWZEnCAcdbs1+Wzy+p6Yhl38G7lOxX2YeDGQmz7wUqD4Ihom7J4PUFUe5K0wjcamBcOHVq+LRLzalF4qVewoCBPuO7VnSpwV33XInO1FN1wriVJPVu+8k7rK90iiG0ddtin0WO53JS8HWmi7sNvp6Sm8B6gx4taCoEBChfXUuvU5HBgANujYzO3za1I+bDndRKYbApCcr6dape24Ma168yYzhyDnBE5/GAZFi47WVv3bFsyJO9onouB+94IvT6gXsTtz9H/xoWJ5Kq7CmqCUiQv807RbKLbOmOA==|920 \ No newline at end of file +}//VNhc6aUWmFD9PoFFusxzxkRJxNn7RzZ3EuoQ6k0+N4EeS4Q7vb7dMlg+434vtgZPQehBrtVUDFUiKenWX3ZhH2XIxxbnSekYnD/ROtSr0SKAyC2SCaTqAUAlS+OF8JFXLbw48jpJOOtSY7LSLZQPztZI1GN7wOYWPNA9uWx6k9g3MtDmpWtg+mpFfwECBzjMXBuLRSImZowkyNxOiSVlgB6UVNo/A/IYp57W7U2Pjm3k28hDTrrPTwptjuWfeg27w62OuNExiPrc7oTe0GCie7zzlEeYnJVSNAHzmhod4JarWbvoPKU5SQ9U4NMWSwVi7zgDI3+6ZIieCFtkk+lgEshwd+vxMO7+0U2cM3Z8V3/mrOfHSk3fIe+tsqaa5KmblfcVnJeV7g1I+gXESKQn5qIaqPIWiqxEnq8OCqLgaQK+hXehY+h8iETNbuHXnPUMEwKBK8SVJZRkfu1L5Z8TzDWVn2G3umhR1MssouW639v0C6tP1MMgN7wgWw2SknxbElvSsiC7RiqoBUFCELQD3BzBJeU8ycRsURdWMEE1bwWPsawKQXOPyQqNZ9+X4geVGpLwOaDbrFE1biFRUKGdt1Ox0fiFV3LQhqrcf4CVNca+XR2XcOpns0QMbzwJEQAe6k/qGMkuVruHVRX+iNfaD/uG/R3HVIqTcut1KrRhll1AQxIuP7FoDAGuO1fooxfg986/ZJusiq9HGupg+C/hndX0HzVCYCkcP8RCQukeW8kXSdDUI6iB8VxBFwNOACCba1jXWMnRuAQurYh0ptNiRdq6wlJ3dERg4bYFm5zNunoJj2T9xZU8c+3Ng4r8Yszy+ddoizAb/G4cYM4B1xQDp//sNQZyazt3Ofy7BszixCGMA+miSxJ2CqaTp0FNW/xAGD73BtOfoTL7MwHJZQUnYw==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index f07919ce..020f2ca2 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -213,6 +213,7 @@ }, "Values": { "0,33": "FGC_审批记录", + "1,26": "保存", "1,29": "展开", "3,1": "工单编号", "3,9": "项目经理", @@ -273,6 +274,10 @@ "ActionTitle": "同意", "TemplateKey": "同意" }, + { + "ActionTitle": "暂存", + "TemplateKey": "暂存" + }, { "ActionTitle": "回退", "TemplateKey": "回退" @@ -292,6 +297,24 @@ ] } }, + "1,26": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "ShowConfirm": false + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main3" + } + }, "1,29": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -891,7 +914,7 @@ "MethodName": "Refresh" } ], - "ID": "5dd97d1a-066c-4ca5-b695-a691f76d0c12" + "ID": "383fc4e0-1bc1-497a-a157-ed2f61de06fc" } ] } @@ -928,59 +951,6 @@ "TableName": "需求反馈登记表", "ColumnName": "ID", "GUID": "06c65a7a-2d90-472d-9cac-7438b2aa1bcc" - }, - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", - "Enabled": true - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=处理反馈工单!ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "ID", - "GUID": "52ce92f7-62b6-4fb4-b165-f4c2718be09c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!ID" - } - } - } - ], - "ID": "c439f4e4-9d2d-4b10-99dd-f3a058f26bcf" - } - ] - } - ] - }, - "DataValidationInfo": { - "IgnoreBlank": false } } }, @@ -1262,8 +1232,7 @@ "14,10": 9, "14,15": 2, "14,16": 2, - "14,17": 2, - "14,18": 9 + "14,17": 2 }, "RowStyles": { "5": 10, @@ -1302,10 +1271,60 @@ "7,9,1,7", "7,17,1,7", "7,25,1,7", - "14,18,1,3" + "14,18,1,3", + "1,26,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "读取ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + }, + "ID": "2996f23a65ee42d680f1126349322fa1" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=处理反馈工单!读取ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "52ce92f7-62b6-4fb4-b165-f4c2718be09c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!读取ID" + } + } + } + ], + "ID": "f11e8251-178c-4c0e-91ca-14e26fdbc3e9" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1342,4 +1361,4 @@ "Formula": "处理反馈工单!$S$15" } ] -}//i440cymrPyjRxHlBDLb8g6WV2ECmbdmzqQcpm8ovRj+dFoM4/015ynw8Lqe+TOw6ISuMnK1kwrzzvV5bbhR0daSWcrjU/pG9ShFl+wzw6nugwWGNfeSvFU9Ye79k+aFh7LypkcHnmDuesu3OBm4ECOUfbHto+sJmbb4SoXGteZOkZpsFA05uBdxtu7c3dxXMLYHyh1hcvYHB2RDViXHMKsXi3tXpSMImGXB8pTVlQUJ4F3UO/HaZUX83kLOKHwJypWNsUBIa11rFWa5EnQlnbKA3BeeXhyXmv8PB8n4Y6MPeGNmcjGsPWfabGeElMDuk80Ui6VUg/wfboRg1+q76/yFNfAph1tdicUxaL7eVQAIK4Ie2dWaPbXLabWsB5wIiSMJS5UbJ/sUKl8ekr2YQIZ07hSskUquPekEhps/1Bs7uuXSciyiXeryQWxq1DEHnEqVWFcM2ghJt210+b7HEkVDjWXM5fheTCD5jSTUMYoY6lCq+87LY8+TZ+JfPnUm9E1uecWoGnTOfhNG55E1XG39pmebWEivuFhp4Rt6v1MRSUmVihQPcuFL0qFtewTcw+goBhktTZ9YLjFo+TRgWbD3hb3WdDgoiUgGY4wZFhgcXY/At3KzcqQpV3ElYzXmFQw12Km7OOvjbGiYnPiN6Y+F1qGFvj84o4QAQH7UtuQY6rmaZUkJqeVGaQjB1WahbvRu7Td4D12Mhq+bJPaAdckPoVbEK41RKpz8feGQVzGQBNUrIfjoduWywXBT/IbUef6cLsQc0kQqV/yRL+DeuzsRgW61H1lZGDeHFNudHX0kMP2WyugofS+SF4y1fBxd5d07dVMkyqjb0iBAYbbLGUrBbFW+XfRKIzLcqJERbTu93HjTy0P9EKuVJivgDf4cWyFrDrdILmZXqJlM5XvB07Q==|920 \ No newline at end of file +}//UKK19NCjpzYferNgf9spKzlQPwlO8JTzVlBRLVHSxdtqBIlsh85Q616V+pFyv0S8Csyn0HBg1f07RpGTuKmh01Ccj5oFb0ow8ooZSFIw7syT/1IarEdZbcjPRrPFNdx9qlcjCLfMofCJLeYt9ehlnjE4SsbCwCtxM8dP8UmALkXua/MwelwWilQQDDxovXDIrTUVT/sdaOL5Pj9v4x+a11Kh9eBp1/QGmlv2EhX5pIHwjCXAMyCK/mfZSw5zXlti/i0ElHAR+KIXPiv85FSI5lOeRSak5gXwvlbfpMItt1vJjCU2PsfKgINZGpW9FP5hq87xI0GHo0r9GWkoFOpMWMgjHOZ+uUnpMhzhjgN5oc+NgEuDYjB3zZLWdXq6aaXUVNjByzu82R1kjMoXd/R9J+XlWxKZ7c/RQ9CtFhgvZPeSGgCG6S87wJeA52bnfoK8xlqoNFrKwmamTLtyYGV7Cjh4Lg9MW8M7kG8hwkvoPismYd0s5iXignZUbAexl4TD5HyR4XaweWK0iNAoQ1bJmQbK3cWU64KPstLPbEBdQ85kI/0bjZs85F8WT3CvNqENmevXvhj8xWYYVppxB1nqasMm+4qp6260d5Ecsxl6tkF/b2vDJS4ulczKsR5OJjKGKmsq2ojTA+uCysSP+91f03VR7UPah27hA6FwKJO1NBZY3Bk7YReoFwhtJTqM5wFEP/PRymOmmmY17Rd9K9JW2TWtlef/tqkONzTk03K3fP5/KvuCxnFV489unujBPv/c6GFRXRmsdILtQCuCeKiLW7laMS6f8yweU61RXiV5meKkoiFnrGJ9m0Pnjlxfv23c/32725gf9uNAni8b/oKcNO9E1anVOseg4rQkOT8iYXCmJ5NSQbaWHqZEcgldvYy3GTVpfYqLeJe/l4g1DkpEpQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 5918363b..54478c57 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -315,9 +315,7 @@ "6,1": "项目经理：", "6,5": "%CurrentUser.UserName%", "6,12": "商务经理：", - "6,16": "%CurrentUser.UserName%", "6,23": "客服经理：", - "6,27": "%CurrentUser.UserName%", "8,1": "项目分组：", "8,12": "项目权限：", "8,16": "0", @@ -327,7 +325,9 @@ "10,12": "客户部门：", "10,23": "客户联系人：", "12,1": "预算工时(小时)：", + "12,5": 0, "12,12": "预算费用(元)：", + "12,16": 0, "12,23": "工时分配方式：", "14,1": "计划开始日期：", "14,12": "计划完成日期：", @@ -338,10 +338,11 @@ }, "Formulas": { "1,33": "IF(C23,H23,G23)", - "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", "14,27": "DATEDIF(F15,Q15,\"d\")", "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")", - "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")", + "14,5": "TODAY()", + "14,16": "TODAY()+30" }, "AttachInfos": { "0,35": { @@ -504,12 +505,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "f707e19c-c4f1-4c02-bcc0-a59beb189ba8" + "ID": "0918c6db-93d3-4c95-bb73-6f36b71f967d" } ] } ], - "ID": "cdaad422-6a1b-45c3-9ad3-aefce7d3ae7f" + "ID": "c4cf75ee-38ae-442f-beb4-8d0e07f4b8fc" }, { "Condition": { @@ -535,7 +536,7 @@ "MethodName": "Refresh" } ], - "ID": "6087095b-41e5-482c-ad5c-d5487eae0adc" + "ID": "fba02c77-bd9c-42f1-950b-9c46e6ee62f8" } ] } @@ -757,7 +758,6 @@ ] } ], - "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -854,7 +854,6 @@ ] } ], - "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -1086,7 +1085,55 @@ }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目审批!F11" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "读取默认部门", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(项目审批!F11),\"null\",项目审批!F11)&\"&$top=1\"),\"\")" + }, + "ID": "e070b0b8627e4b1cae58bd4098a67347" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!Q11" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!读取默认部门" + } + } + ] + } + ], + "ID": "b651202c-4278-420b-b43f-306a96c4ac95" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -1325,6 +1372,7 @@ ] } ], + "DefaultValue": 0, "min": 0, "step": 1, "placeholder": "请输入", @@ -1357,6 +1405,7 @@ ] } ], + "DefaultValue": 0, "min": 0, "step": 1, "placeholder": "请输入", @@ -1673,59 +1722,6 @@ "TableName": "项目表", "ColumnName": "ID", "GUID": "f5438dcb-857e-4cc3-a805-f1b53c1958cd" - }, - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", - "Enabled": true - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目审批!项目ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "efa70656-7fe7-4e27-be20-5f3952cc6eb9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!项目ID" - } - } - } - ], - "ID": "287b13ab-ca55-48b9-8681-e064b60e5deb" - } - ] - } - ] - }, - "DataValidationInfo": { - "IgnoreBlank": false } }, "22,11": { @@ -1748,34 +1744,17 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目审批!流程实例ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "61a0552f-c5ce-4237-9334-ef6c9f4a75e9" - } - }, - "value": "%Null%" - } - ] + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目审批!流程实例ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { @@ -1823,7 +1802,7 @@ } } ], - "ID": "6ad616b0-1393-4f77-9bfe-588208801b9b" + "ID": "87904a2d-f753-4a95-9162-7da2c7342ad8" } ] } @@ -2314,7 +2293,6 @@ "22,2": 21, "22,6": 22, "22,7": 22, - "22,8": 23, "22,11": 23, "22,15": 14, "22,16": 14, @@ -2377,6 +2355,55 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "Title": "立项", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "读取ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + }, + "ID": "e1a96b6d7359474b8098192937c8a4c5" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=读取ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "efa70656-7fe7-4e27-be20-5f3952cc6eb9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!读取ID" + } + } + } + ], + "ID": "e08053f6-6125-48fc-b23c-3815bfe89954" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -2409,4 +2436,4 @@ "Formula": "项目审批!$L$23" } ] -}//W4I0jlVuizrmNh6D7xmsi5o4b597XNALp0+doFOF1as0OsUEK5DWrUBaa+rytgzq8NBI8pBuyZA9vR2KgES15sllYL+Oq/lRcPWMrrIrEZVmLRlRZmKcVKm9OZSUx5uoOFrQMPzY7iV+6WvAzo7sC0w1ak1CWRqGnwvVzNE1hi0ut1O4ZTmwbBcp5CFKGnyQ/R6erMdbhKaN8dbSBzwBiXlCZiLbcQanElzbQWKXpBvtilJJEGpazF5kI7ruK7uVoBBjyqnbYNvkpLDV2VCHwCP3zctJke2CeVps6oQBhy8o7k9A2XzxAMf3klaHE/L2EJCv+lUCa447IrWmaC8CMeE+2Fqt8XxfMj9mmCdp3gxAiVPZJuih3TmH3xoMHkC1eEeYHEFAbEK7RhF/t7Y9IlTdHlUAqPPjoqksE2LNZZrGbaeFYYDNADxXNh5Pe5rdDB7gClmQ1hhCG7dxm/eO7cg/c2VXPi3xWdrlbpuGrb28C2MI+fYVc+bdV0EAMVWplPOZIUaamXrGnym5ZAIJ0e19ML3mBAiVoiTjhhz3oNLac2QXC6/iU3XaF85c7DHEMoxBoQjIr+oK/PCvUx1xNygv0EA2ZiwsELpbmVJf7ko0c+rn2Bn9TaaFVgd7ldu7F5UrzNVQpIsue5EFEa3F/GECtLYWeLGR5UJ6eelplrTH0+n57c8f3Sn5gtNjHB67JaY+mG4I1JLg2tUGk4suEJvYdm6nEwO1bS97mu8QEyku0Zl0TuNJE3ieJR16MgzgxpIaSgahdNYGRZ/vEAElydY4JJmbUH+nMFoDgv/UpFHM4cW+epqJ+tF6Ato4eXOLpx4T7iQHNsyO4Dj7KLRF3ng7gSTR180xTfzgo6ciWW6HQjdRVYVLOsH0bc4GHcISUzmwdlh6XYKEx6oM2p/4iw==|920 \ No newline at end of file +}//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 diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index dfba4920..f2a46fcf 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -4,10 +4,11 @@ "RowCount": 23, "Formulas": { "1,33": "IF(C23,H23,G23)", - "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", "14,27": "DATEDIF(F15,Q15,\"d\")", "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")", - "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")", + "14,5": "TODAY()", + "14,16": "TODAY()+30" }, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 95ea16d6..17e0ae45 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -102,13 +102,7 @@ "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 455.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "Mode": 1 } }, "12": { @@ -262,7 +256,7 @@ ] } ], - "ID": "634ae43f-7b8c-4b39-944e-cb0884c106c1" + "ID": "83b85cef-ad25-42ac-902a-6de85bd6ac4b" } ] } @@ -484,7 +478,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "685469d9-e499-412e-91f3-915ade2801b0" + "ID": "847dc923-2b4d-47ea-8cc2-9affcec36dbe" }, { "Condition": { @@ -506,7 +500,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "6d3b7b6f-ccf0-4c9a-9e75-778b505f1fde" + "ID": "d9933c17-27cf-4c86-a644-073dfb2fc181" }, { "Condition": { @@ -553,7 +547,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "02031dac-88b9-49bf-8cce-774e095db974" + "ID": "2cd8b477-6dfe-4753-bf84-d4fc703e16e7" }, { "CommandList": [ @@ -563,12 +557,12 @@ "Message": "只允许项目经理进行申请" } ], - "ID": "355cdde4-017d-46fa-afc0-a248705b768b" + "ID": "9c361a41-c4f8-4615-a65e-38d6cb0e604c" } ] } ], - "ID": "ad49d37d-ad45-464f-a273-03237cba0afd" + "ID": "e0a6c4d7-57db-455f-a8a1-c54c3535be60" }, { "Condition": { @@ -604,7 +598,7 @@ "Message": "操作完成" } ], - "ID": "62e4ae96-c0a5-40f2-9621-246597363d32" + "ID": "d00d521a-7784-4d53-9c17-9e79c854ac74" }, { "Condition": { @@ -700,12 +694,12 @@ "IsOpenInNewTab": true } ], - "ID": "ebc953b2-5013-435a-bfef-f0a3615df450" + "ID": "55005a68-ca62-4836-8ede-ea9c8932d8a6" } ] } ], - "ID": "db9ca073-74fc-4059-a3ca-8bcd60df2ab4" + "ID": "e5f890c3-8ca5-42de-9271-d5d2c1facced" }, { "CommandList": [ @@ -715,12 +709,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "25c6516d-fea2-4dfa-bcf5-72465fb22fb2" + "ID": "4fdcb70c-42a4-4e86-b522-50703597ca28" } ] } ], - "ID": "21ad0999-4f3d-4b14-a3e0-a9d89abca466" + "ID": "3a095f9a-27ca-4369-b197-0c93a0365409" }, { "Condition": { @@ -753,7 +747,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "b098c267-9591-4c22-b62d-3093c5e7645c" + "ID": "a5d3f34c-b787-40ce-b017-7fe6c1f75069" }, { "Condition": { @@ -775,7 +769,7 @@ "Message": "暂未开放该功能" } ], - "ID": "aa3782cb-7a60-49bc-93a2-cb653b79684c" + "ID": "e9206a2a-f644-46e1-871b-40db7009adbd" }, { "Condition": { @@ -810,12 +804,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "b43c9d94-8aed-4c8c-9ade-9315a63417ca" + "ID": "2566b7c1-269a-4031-b8a1-4c5b4ca0f89d" } ] } ], - "ID": "4c805b53-d50d-47cb-9e38-3dd857268bb9" + "ID": "25551af4-5e1d-40f7-b856-9230c935e7fe" } ] } @@ -889,7 +883,7 @@ ] } ], - "ID": "04599a7a-d9bf-4624-9ed1-bc16ab92c766" + "ID": "86e7e52c-a412-4dcd-860e-5901fad4e753" } ] } @@ -1125,4 +1119,4 @@ "Formula": "项目标题!$F$2" } ] -}//TgFY8KXLPyWQHl18p7lHYSHWG5JgPhSrsXnoxG1yitako6aI7wc4N0ZQ2z4hPtuqCg2sIn0dtfnUJ0PYffoUbHfFYZ75iXYKh26Vy82DSvLbx4BcxxJN9spUJq/jj1AYiaPAU3p4P87anHP/OCdOwZDdqjmRDp6OpuZfWCQpzuC6jrS1uj+TqkatkPzDZeuJma7mrLIuqHtSTnV0REUAMjwk9WTtUyb5JGfNvFfINm9NHgRFIZVKG36mr+tC5LV5sEPX7oUo4yP0Xc7YzyrfT/uRPaT2kMq1qMF2qkCBg4LtlmcC6ORCP4YK3oUiYiXtqqqy/p7FsLK5GQ0pd5XQIUZxL+zBUoH2g2THTpCRNIaByyDUEo2XKtQFsCW5eb9mdaJkC2wGRqxhE7ksUpE73EkpV+CIW/z9SREPHsPEqdaFJRtC+C3V/a9JGxEdfijlV3OJ8uWNO92ahBdM+TldFc/prfWpJqAgja/Sy3gxqzsK7XDcPY0vGCjD/Czs2pE4K1G6ZRhcuJQNBkg21TmrcrVQTuQnR+pbsLqoda1oZiv0peRPt7nkCBhHDDtd10ZbqqP3Xbj5tRD6SPlyRJ0QFwGuNde4WwkfAtFKks0Eyg9Aa6PjlD8PsySwLfqw48h9Nfvc0aYk3OgDZNRGyhioKCnpjGST1TKSSIb8F+p5Fkjs2BHBjxMU8xrVer9tzrm7WpoqLS9n9HFZZoKJVoLK6ZzrlWmOdl9yXqjkCdX97kZMcELkAzFQyEKsHPmf7KZx1nhssBvzDGdShbv11sNvvNQmYH6wyMttSRU/afESBrl+apNnF7TR75e0c68EyhWLbIAICRJEzjUDqsE0flUmC26PAEsXZ04s3OcfIbAEvV6pQFMsvM+ukF/mMlDpgjsoEz2lNZVBIN4T5wTa1lzj5w==|920 \ No newline at end of file +}//7QW0uEvQiw9xcBMdApdBNQj6YpRgHnFse1sSyEBG8ccIz5sMJtgol8DsNiFKOGLP3TQSUnOrD1rR4qffoiWD6jV+VDCvda2wJyVBXr5CfMDqEb38iFMzohQt9axaMDAfcUte6TQ6+xcM6owwLs/EF4cBxJVcAxyawmw2x3mYRw1EKnDKHnPRyNw26DVlX/lo2ITQ8O2jqVBi5OGTO7ibtGHv7+5wL/Yn33GuVlCuXCPa0x1TWcFIAUrkog+Z0VUtSOpKKnlhO8tSII5xtf4wEhtN8hFQI0pX0GN+1/qBiqOgbkZZeMpsi/zRL832uUl6hubIgMm2QKMabVsmyzm11WPiIcpt2L3ptaxTLTmxvbs57Eq2WYBtEfcTgyYx4ZX5hZO2MwXXDa2Bnv0mncYMCD0JFpaVolQ6SfWxkNJ64LkAp47jFfGL6c6zXoUuNi+5dbMB6rBrDlC4b9MT2o0T/d+bPb5axtCf1wIJLd6aYlwsOcpFl6CwxzIXHbtlO9bImdjfqvf269I3ko+rG7S2ZXPN/kZBBL7qEjMA7iheY+tWFvgNrjOBzLPvtzotpXbEoYdxha4Uwn+cnh9HJ8hD3gFEy5md6UhzV6r7627lH/qpxLfxDkfH0EHFq2FW3csAiVyV45trtUBX8gt0F3aTlnctcEmSw8bg8ref3IJ2Xet9PEJV5jFV1/BHk7UGSbBkiiQxBsHUEv69IZhtRerPko87PIBASn/YyDAl5zkZVcSdqGVetbsbQJtk0zoauVubf13bntCXgRu2TKMjUX6mJ4lyV/MP/H7hVzCbzvE2y69hPX9BhDBdQecm6oaAeyuIdnUkz25J0Nh5EslX4W5UFrOC2Ck/Ic5aCX24WOgWJaWKsDdl/p7VJAYclehp64/dfyBOUaAqpQQu1+e6um482w==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index ee77ce1d..80548be3 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -131,8 +131,7 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 1 + "DesignLengthInPixel": 32.0 } }, "13": { @@ -157,14 +156,7 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "18": { @@ -249,7 +241,14 @@ }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "35": { @@ -337,7 +336,7 @@ "NoneItemText": "全部" } }, - "1,18": { + "1,23": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -428,7 +427,7 @@ "noMatchText": "无匹配数据" } }, - "1,26": { + "1,29": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -661,7 +660,7 @@ } } ], - "ID": "f861afb9-6ca1-4d77-85b1-56fbb56ccc93" + "ID": "c6e01505-0281-430b-b04c-1714ea98292a" }, { "CommandList": [ @@ -673,12 +672,12 @@ } } ], - "ID": "a0347084-4813-4719-9a05-be8b25ea1d31" + "ID": "d06d4332-5a4c-46e1-9342-b3d74acfd2ca" } ] } ], - "ID": "c37dd705-9572-4814-befa-4149a363d551" + "ID": "bdbd5831-cd27-4b2e-a056-693c72b9efde" } ] }, @@ -743,7 +742,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "5084d7cd-421c-4a49-8931-d3ea632a4d5e" + "ID": "191fd832-2e64-4578-b89e-14ca89a4d3ae" }, { "CommandList": [ @@ -758,12 +757,12 @@ "BtnText": "知道了" } ], - "ID": "6a66f73f-05a6-4a15-9a98-a39a9c7f7fa1" + "ID": "e2b1391d-4c62-45f5-a9cf-836dccef71d5" } ] } ], - "ID": "b1cf223b-b3bb-4f68-9421-24030fd5f89a" + "ID": "1bc0eb2c-763d-44c7-81db-d688c610905c" }, { "CommandList": [ @@ -785,12 +784,12 @@ ] } ], - "ID": "3fa29cd6-06c5-442f-baf0-fe542dea58e7" + "ID": "9ac13698-7e6f-4cac-93ef-2b23b8d1d209" } ] } ], - "ID": "a9942144-1c64-48c2-9cb5-3067441adfeb" + "ID": "ad51d8dc-3362-42b7-bc39-ca641f0e53ab" }, { "CommandList": [ @@ -805,12 +804,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "6c9d3639-91f9-47a2-81d7-a0043ba87531" + "ID": "4eb51f42-82c3-46b3-90eb-83af8f6bb1eb" } ] } ], - "ID": "6a50ca10-8aac-4f3e-94dd-5db129f59c02" + "ID": "cde3c3ce-7bf0-4709-8f7c-a53f7ccdf58a" }, { "CommandList": [ @@ -820,7 +819,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "19fd5c78-eb83-4f01-9b03-6b0c2ae59cc0" + "ID": "00772d8d-1fb6-4f07-bb6e-703321f1b2b6" } ] } @@ -1137,7 +1136,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!S2" + "SerializeProperty": "=任务列表!X2" } }, { @@ -1150,7 +1149,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!AA2" + "SerializeProperty": "=任务列表!AD2" } }, { @@ -1286,6 +1285,51 @@ "ShowOperationColumn": true, "OperationColumnSettings": { "ActionButtons": [ + { + "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", + "Type": "button", + "Name": "详情", + "StyleType": "Accent 2 0", + "Shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "6a721307-5546-48b1-944e-d04195469758", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + } + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } + }, { "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", "Type": "button", @@ -1383,7 +1427,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "048ba506-6445-460d-8324-1424f0cb3c2c" + "ID": "af6cdc05-1c8f-4c67-834c-5ed744dca1a1" }, { "CommandList": [ @@ -1393,12 +1437,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "c843bfc7-fd5d-44d6-9c5b-6d4ba11ef75a" + "ID": "79818966-8edf-4761-9394-b6e798a81162" } ] } ], - "ID": "63980e3c-8e1e-4e5c-a5d3-d763a32682df" + "ID": "dd9e0a6f-1f0c-449f-848f-fb53a1a0f6f9" }, { "Condition": { @@ -1424,7 +1468,7 @@ } } ], - "ID": "2fa1f1d8-7a4e-4c64-a681-502ae58d5eb9" + "ID": "ae0ec473-4e62-44e8-91ef-73cbb25e77c4" }, { "CommandList": [ @@ -1463,12 +1507,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "57338692-c42b-45d1-8b93-53dfea8c2181" + "ID": "38a83426-6bf5-46a2-aa8e-06fd8141fd8c" } ] } ], - "ID": "a91adea7-4d66-4fa9-a8fd-2a518658b045" + "ID": "065fad13-9a90-4446-87f1-ce6be40a8a6e" } ] } @@ -1477,50 +1521,6 @@ "dataRow": "行数据" } } - }, - { - "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", - "Type": "button", - "Name": "详情", - "Shape": "default", - "Commands": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", - "ShareCommandContainerRefer": { - "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" - }, - "Params": [ - { - "ParamReferObject": { - "ParamID": "6a721307-5546-48b1-944e-d04195469758", - "ShareCommandContainerReferObject": { - "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!行数据.value" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - } - } - ], - "ParamProperties": { - "dataRow": "行数据" - } - } } ], "Label": "操作", @@ -1638,22 +1638,17 @@ "1,6": 2, "1,7": 0, "1,9": 3, - "1,10": 4, - "1,11": 4, - "1,12": 4, - "1,13": 4, - "1,14": 4, - "1,15": 4, - "1,16": 4, - "1,18": 3, - "1,19": 4, - "1,20": 4, - "1,21": 4, - "1,22": 4, - "1,23": 4, + "1,23": 3, "1,24": 4, "1,25": 4, - "1,26": 3, + "1,26": 4, + "1,27": 4, + "1,29": 3, + "1,30": 4, + "1,31": 4, + "1,32": 4, + "1,33": 4, + "1,34": 4, "1,36": 3, "1,37": 4, "1,38": 4, @@ -1782,14 +1777,14 @@ "3,1,4,6", "3,7,4,1", "8,1,1,6", - "1,18,1,7", - "1,9,1,8", "5,10,5,28", "12,1,1,5", "12,8,1,5", "12,13,1,2", "1,36,1,3", - "1,26,1,9" + "1,29,1,6", + "1,23,1,5", + "1,9,1,13" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1937,4 +1932,4 @@ "Formula": "任务列表!$I$13" } ] -}//z0b7FLfLlDw2Oga8Wg7zshLhE6uwOQEPwcN4dmfGweESO10wE078FRqlrLkV4UtneALqC+QfHqxajnMz8boAbAr/Zey1wz3edMZTCP7lL/fc/Ryxx04bR6sbe+UbxXU6HU8xDcxxtvyBnhzxkQP0+KUkGEnkAjb9kAImYgEAyntyZchpeMb+ApvY4wPZwuA1mGvzjuL99vV7eiATze9ghNfjTITfjYkA6Yvk2CRGfgM6XxkVoH0nnByoNvKCrmFzykLVEtOBhhvdWp9+P+d3g4AdDnsq41Vdrp/6B7dflZ5faqIoRmgT+ro//66efyd/u59Z5/j7V7bydrBKPV50bOCc9WMY0j6jBH+1c2+BNpi9CDNU4zEw8Y7J2dY5wX0K89P4ROozqR9TfchhYX/pHhYQQ97pjditC/cc8pOyFdv53wpQAHHAPJgvE/YY9wUCa0VBhHcndFQXiEHLGSy8rTgwK1jsNE8vl/4JRYx4jI1/JqEpt1hccZuNhC5oZC/bJ+QzJql7p/rB11xNF1HvrIaF5Ssj9jgR22GttC/FOT9e0B6V3N35zZqK1RzObyRA86jMMMQ35jwvQ5Jag5kZHjnOlw1V+bX2pmEAqRjmE+LN6NV7r49uvOOqa8kvJSexEeGIPZG99qhkNxV/POet0z5ox4iyhkDvdAiLT3U8ZdHpMLzecdX0XIwBOFC0Ke42R81mS5ii+gKRr0+alOvvuBldSkqan0AGajAWAAD45BaCHYVtMYoQSk5JwPmf70mwMOMYBVJdjRfd1PDF2WZavxQVtEy+4YJLvsf+ijT9T0E/FtmrvA8TM1J194bwVq7LYGTyYmCuXarS/eKJc2BCZtXU8TQWWsJeNJuCsl9SYswobGizzwWKpnJ/BULK5UjhtBYsnuHpWZ0QjvnK4JQzNg==|920 \ No newline at end of file +}//lAWM7baE717GSvWBh5E6AcNGK+BcECzw74CoWagnRWyZPGN/SQg8fUaKVOudIIG0GmMJdpmgCeewESkHj+bZMlh6bgntIfOQP5yJZEGbgGR31uqnlxQOQBomni9PvncwaqNZdXdypyvR9PmyvoOa0i5RAQtzZcmrRbz9hxgl0h2+YZc9EBk5cdy87OCjE7TpV58Z4aaDsI7quCF1dX7PiAMl2qktCJwozhDvPODe70c0IxEzWoWMqZW4B74e0mrSdGeqHc5ZrzzlXMtIQ8/oOU8aEwtTn15P2+L3GnPt45pED5hMlc1gacRqlIMcwmDJyFmBTMEOHdy3eNe7ZR4b/pHCBMA3Bv7RXUBjQRCdcAFIWRwAhHYyGWrkuiTyzWjI9dHhA0wi+wyq8Yrzvlm2IlbRrJYxRLlh5R+7qwa8/+ijgQjzGdUSz9ex8JVTh20KHh5rQ+84xH7shZsyyn3Dotc+BmtlNLs5YKZnst7gCNwvp4vKIOzbc34bA15wzClJd09qKkOqbQBM+MxDaRkonYd8lefAIjprHd/AseCe6j+mNSGXTQnt+uWKe9ecWb3MeH4AdqsRi5xV1ixZZV8qNonovvqrLG6XUZgFwhbLLlWg1Nu9CtVt/XdN0ZCMP2gGKGDK+cZCiQfh5tQarGHlqPMJfBbg4QUrvHdj94R9FYR37DOVJVSXfweCEDypuRutvNkTm0Fr2mSGTVVJEO2XWuP8kuxjpd3EWv4AFFqUsEhTE69bQImGVnmUf+bTD8LnL7JEqfixxWh+8xlz4JuuZa6S+Z3oRmKvZvvRdaE7UW2OegqQaLId1VZs/lue9iUk6CbOIjpX/is0/5qeWVr6CuDrU+t3hPuVk9ZxH1CSxZbaFmJGs0CSq+ylA4mZaK7CJjlqxHm5N0jkRMDwzzjhYA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index bba0699d..861563b0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -345,12 +345,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "7363cf4d-6a08-4990-8c73-4639de66414b" + "ID": "2d61e5f5-96d8-44e2-b332-a603cb33b2d9" } ] } ], - "ID": "2ad223b6-a544-4552-b985-5d9616f8dd92" + "ID": "c4a63e52-0e32-4b8c-891c-e9f31737608e" } ] } @@ -398,7 +398,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "f8c7ba22-9dcc-453f-ac0c-a5fe97d15f39" + "ID": "97880e61-8ec8-40b9-82e1-51de8afc51f5" } ] }, @@ -612,7 +612,7 @@ "MethodName": "Refresh" } ], - "ID": "5ad26202-0308-4f00-9581-d4081109ce80" + "ID": "adda2e37-c58f-4f65-bf30-bae5d6572931" }, { "CommandList": [ @@ -627,12 +627,12 @@ "BtnText": "知道了" } ], - "ID": "b6724eff-46ae-4621-b64b-98f885fa507f" + "ID": "262ed60d-8c89-4570-a7d6-b6d27d5b2d41" } ] } ], - "ID": "b0b023fd-8fbd-476c-85fa-e835f30e3240" + "ID": "5f640b63-0d2a-44d0-a42d-d0847dd78744" } ] } @@ -770,7 +770,7 @@ "ReloadData": true } ], - "ID": "ffe22abe-fa1a-4b14-9b77-0161a2af4b2b" + "ID": "4ae85616-25cb-4c0a-b912-ddf67587929e" }, { "CommandList": [ @@ -785,12 +785,12 @@ "BtnText": "知道了" } ], - "ID": "4c9f11c6-8280-4af5-b991-cd458851b451" + "ID": "23487978-1630-4bd4-b39c-c6eb0f25f6cc" } ] } ], - "ID": "219828b2-6e6b-45a1-b43e-19885d60cdbd" + "ID": "539c7828-d53b-4157-9e8b-4d797cf612c2" }, { "CommandList": [ @@ -805,12 +805,12 @@ "BtnText": "知道了" } ], - "ID": "d4bf1e3e-349b-4408-9abb-9bf7d1adc3fe" + "ID": "0255465a-a07a-4d00-b766-e6942c0e0008" } ] } ], - "ID": "b07c90bb-d156-481b-ba96-0606a77f19c3" + "ID": "c1616066-ea68-4874-a9a5-43dc28d3b64f" } ] } @@ -886,125 +886,6 @@ "TableName": "任务表", "ColumnName": "ID", "GUID": "377679f1-fc78-4e1f-969b-2f04378f0d00" - }, - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", - "Enabled": true - } - ], - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=任务首页!任务ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "84aaf6d1-ccac-413f-b4fd-82eb5c2aceef" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - }, - "compareType": 1 - }, - "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "6ce69494-4c4d-4326-ba7e-3c3ea2749d13" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - } - } - } - ], - "ID": "a88d06e8-3957-45a8-a509-4d1924d0879e" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "70943c45-9ec7-4f2c-bc1b-5550025632fa" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - }, - "compareType": 1 - }, - "CommandList": [ - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "9bb62403-7846-4088-8fee-b41f54adb777" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - } - } - } - ], - "ID": "8d93ca81-ee00-4114-9227-e8d782a83a64" - } - ] - } - ], - "ID": "ebf2f8a1-4f83-498c-b1d4-83f724100851" - } - ] - } - ] - }, - "DataValidationInfo": { - "IgnoreBlank": false } }, "6,10": { @@ -1058,7 +939,7 @@ } } ], - "ID": "fd3fbda1-bab4-429d-963d-869dca060cdb" + "ID": "fdc01d92-29b3-46af-92ef-9f4859f59ff6" } ] }, @@ -1099,7 +980,7 @@ } } ], - "ID": "d838f96e-3076-4978-8bd0-e4b69b389961" + "ID": "e4606c37-9a0d-4bc4-90e1-515c6ec58659" } ] } @@ -1214,7 +1095,7 @@ "Disabled": true } ], - "ID": "bdc34ac6-39a2-4f51-9ef8-ae788b3a9c9f" + "ID": "8d1a45d5-93f7-46d7-b0ce-2d4cb0b6db8b" } ] } @@ -1392,7 +1273,7 @@ ] } ], - "ID": "83eed446-cef5-40b7-ab01-1c0a5bcca5c2" + "ID": "6553a8e3-9a8d-42cc-b10a-09b9303746a5" }, { "CommandList": [ @@ -1409,7 +1290,7 @@ ] } ], - "ID": "5ec48df8-5e2e-4bcc-ada6-2c9781a6dc6e" + "ID": "8576c5cc-9b56-43e9-964e-65603c6259c0" } ] }, @@ -1643,8 +1524,18 @@ "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 6, - "Formatter": 7, - "HorizontalAlignment": 8, + "HorizontalAlignment": 7, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1, + "BorderRight": 1 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 6, + "Formatter": 8, + "HorizontalAlignment": 7, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1, @@ -1674,8 +1565,8 @@ "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 6, - "Formatter": 7, - "HorizontalAlignment": 8, + "Formatter": 8, + "HorizontalAlignment": 7, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1 @@ -1724,17 +1615,7 @@ "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 6, - "HorizontalAlignment": 8, - "BorderBottom": 1, - "BorderTop": 1, - "BorderLeft": 1, - "BorderRight": 1 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 6, - "HorizontalAlignment": 8, + "HorizontalAlignment": 7, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1 @@ -1742,7 +1623,7 @@ { "FontSize": 13.333333333333332, "Foreground": 6, - "HorizontalAlignment": 8, + "HorizontalAlignment": 7, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1, @@ -1764,7 +1645,7 @@ "FontSize": 13.333333333333332, "Foreground": 6, "Formatter": 9, - "HorizontalAlignment": 8, + "HorizontalAlignment": 7, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1, @@ -1814,8 +1695,8 @@ "Right", "Background 2 0", "black", - "@", "Left", + "@", "[AUTO]General", "Center", "Background 1 -25" @@ -1921,76 +1802,76 @@ "6,7": 13, "6,8": 14, "6,9": 14, - "6,10": 15, + "6,10": 16, "6,11": 14, "6,12": 14, "6,13": 14, - "6,14": 16, - "6,15": 17, - "6,16": 17, - "6,17": 18, - "6,18": 19, - "6,19": 19, - "6,20": 20, - "6,21": 21, + "6,14": 17, + "6,15": 18, + "6,16": 18, + "6,17": 19, + "6,18": 20, + "6,19": 20, + "6,20": 21, + "6,21": 22, "6,22": 14, "6,23": 14, - "6,24": 22, - "6,25": 19, - "6,26": 19, - "6,27": 19, - "6,28": 20, - "6,29": 23, - "7,1": 24, + "6,24": 23, + "6,25": 20, + "6,26": 20, + "6,27": 20, + "6,28": 21, + "6,29": 24, + "7,1": 25, "7,2": 14, "7,3": 14, - "7,4": 25, + "7,4": 15, "7,5": 14, "7,6": 14, "7,7": 13, - "7,8": 17, - "7,9": 17, + "7,8": 18, + "7,9": 18, "7,10": 26, - "7,11": 19, - "7,12": 19, - "7,13": 20, - "7,14": 16, - "7,15": 17, - "7,16": 17, + "7,11": 20, + "7,12": 20, + "7,13": 21, + "7,14": 17, + "7,15": 18, + "7,16": 18, "7,17": 26, - "7,18": 19, - "7,19": 19, - "7,20": 20, - "7,21": 21, + "7,18": 20, + "7,19": 20, + "7,20": 21, + "7,21": 22, "7,22": 14, "7,23": 14, - "7,24": 22, - "7,25": 19, - "7,26": 19, - "7,27": 19, - "7,28": 20, - "7,29": 23, + "7,24": 23, + "7,25": 20, + "7,26": 20, + "7,27": 20, + "7,28": 21, + "7,29": 24, "8,1": 13, - "8,2": 17, - "8,3": 17, + "8,2": 18, + "8,3": 18, "8,4": 27, "8,5": 14, "8,6": 14, - "8,7": 16, - "8,8": 17, - "8,9": 17, + "8,7": 17, + "8,8": 18, + "8,9": 18, "8,10": 26, - "8,11": 19, - "8,12": 19, - "8,13": 20, + "8,11": 20, + "8,12": 20, + "8,13": 21, "8,14": 13, - "8,15": 17, - "8,16": 17, - "8,17": 25, + "8,15": 18, + "8,16": 18, + "8,17": 15, "8,18": 14, "8,19": 14, "8,20": 14, - "8,21": 21, + "8,21": 22, "8,22": 14, "8,23": 14, "8,24": 14, @@ -1998,27 +1879,27 @@ "8,26": 14, "8,27": 14, "8,28": 14, - "8,29": 23, + "8,29": 24, "9,1": 28, - "9,2": 17, - "9,3": 17, - "9,4": 25, + "9,2": 18, + "9,3": 18, + "9,4": 15, "9,5": 14, "9,6": 14, - "9,7": 25, - "9,8": 17, - "9,9": 17, - "9,10": 25, - "9,11": 25, + "9,7": 15, + "9,8": 18, + "9,9": 18, + "9,10": 15, + "9,11": 15, "9,12": 29, "9,13": 29, "9,14": 13, - "9,15": 17, - "9,16": 17, + "9,15": 18, + "9,16": 18, "9,17": 30, - "9,18": 19, - "9,19": 19, - "9,20": 20, + "9,18": 20, + "9,19": 20, + "9,20": 21, "9,21": 31, "9,22": 14, "9,23": 14, @@ -2027,7 +1908,7 @@ "9,26": 14, "9,27": 14, "9,28": 14, - "9,29": 23 + "9,29": 24 }, "RowStyles": { "4": 33 @@ -2077,6 +1958,68 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "读取ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + }, + "ID": "5eb1c93f6dd746dba09d375b3a3027e6" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务首页!读取ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "6ce69494-4c4d-4326-ba7e-3c3ea2749d13" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!读取ID" + } + } + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "ID", + "GUID": "9bb62403-7846-4088-8fee-b41f54adb777" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!读取ID" + } + } + } + ], + "ID": "76b348ec-05bf-4c96-b82f-5c96e99c8eaf" + } + ] + }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -2183,4 +2126,4 @@ "Formula": "任务首页!$Y$8" } ] -}//fsyf3rIdceXgkqEHOHQTNA2ED3CwXT8pNpvkhtU+WFJJH/qHBThS7nZr7MW9HypfpFfsdjT/mAnDq0XGYxZSYRikrDszZ+QO/JENs4+J8PTkwbgt8IYbIfnZPz/YZT/XJrAp1plKX1SduxtUufAB5SQCqOfsAiNF4UYmaLE4BdUiDqSgjMfsNqm0ELplXX8M6yi9coM0eHxh+hRoP69pPou1e4z5ANkRaDcBOt5SQe/H1Xkiean3CAJeYjplDKUzho7S/fFPsaHQnoXwlnx/qJwjHb/26Tk7bdLhw7QmsjkLyvOzbOBcn+HB3IquQWvi/Ov45f0xlrZRsHURoqCdEzWVqPTULY4vxqvHM21zMJ8/3pCwIivs/LyN0hMryjen/Ux3vxjKZ8RxdS5stbbh4yWKhqlcdkFKlXveUVtANLni7p1+AbgnNSTBBgbiDeMbBlUf8IOuYP19ZoVhTeqWR/J54Cv4Nl2mnFuKBSo8M0KzXFt4y9FoMKDNitX5HhcKrrqrJ6OCq2n3MzsgO6nGEODSd23pSt3eddeazpZKZUhkSEL54WbaNRTOv6wTvkAlZxnYuwlDmpvd/W90f8kft7MI2KA8rjxF9LOMBQm7CBdZQizc2Y+C7x8v3wc4U1TO55VLJhHsPdniQjoJLFY4FiBmJgP1+tXjAg/Aup781GKh8M527Rzmpc30Lo355ZRun5XNJy3UOBI84V5Ep9FRU0044Dccavr42jCyj2Wnl7n8YjDDvOBCbW30H+GIEht3/19y0MOOY5VvPJdfdoqVffB0Ito4cXLAMJpQe0K2Qb6xh0OEy910fZedLTpdUNOoiKl+yF7m9wSldPKs0J9hRuXEl0OsIeM/JPZbpXmiWiPTKki2jXmYCCKHpqF1dWVP6hYPHolOVpxXyYcIEO7lww==|920 \ No newline at end of file +}//YcmhDPZFW9t+4/XA+rqf7BomXp3Tev370I9aP6g86F/q0nAFMc8+PKdNYBJtK8G1ueNlN1BSpqz5dohZ2fG3UQjy3TT0i1gc1uvlv2YiSWhM+m2I5QS2g3N4pVRfQO5F08M8aYVY0035hnzH0yOTaF1/EjaEtCcHAsy3I0p0QHcSooGmx5fh1vHlXOGb90MojHXH/YUR8OeCvrZzfBvaRhnRr6cju7XaSm36Xrg5iyQMBPaBF65o+pI3M5MvuDioSTJUwykOHqwHSCSUybAbQ62wODWM+yQF0qknXa/vBodzINDI0TAqDzX07/EhmS0eOwtm0EKTlmManWwJmejPTLyFQHPySicRncSFTfFTXM8PSazBl7KPLUTtmVgFQA2sEKREj/klXS690PmuTyMyI++t3+d1PdYz5pHIXfkv9IYlprX3OZQ6uUBtS/g2e3R7HmoDv4bHCabinatzcksxi10BYbBLOvd4jcO0zwlNfEEfqgwCdkhkSTjMs6VSJgDaZhF1tKLetJB2S0OdIjJ46Fa84iW2yUHQLqrOcYj6B2pOErbh4yF/NSB4egMrFmk3m+dLEsZPp0nSx+e4jvKqt78hYx/mHzQyYIPgR3k40pok2Ea8sz9FRE/qekw4rvzyHdGm1cXdCdX0OJFImXwed9X2XUclcycuSIEh7RCrt+UO3ouEwHV2ONqm2YZgxLqILtk3f8ucZHhkgY+8HoPlgorUiaJvQEvuFDxFK5KZY8r08w69B8NccILZx+aPubrl7VdxIJqq2N4HBwnw7uFhfsT5/s0RCyT/e1kobq+C+fQHm8N5WMuv41Yk4a+kwWuajHtYnl7cSFr3j9qdShH8GE4nXjBNMUYHoWWdzXiz7zXaSJc/cB+nQYsuv63RzlWiCisPpQ8t/i92Y3ehiuwiQA==|920 \ No newline at end of file diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn index 46566abb..611c384a 100644 --- a/Process/反馈处理流程.bpmn +++ b/Process/反馈处理流程.bpmn @@ -4,7 +4,7 @@ 处理用户提交的需求反馈 - + @@ -14,7 +14,7 @@ - + Flow_1919cz7 _8c854f9d-40d8-4aed-acb1-6778e09b2e08 @@ -35,7 +35,7 @@ - + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 Flow_0b772fu @@ -50,7 +50,7 @@ - + Flow_0b772fu Flow_09gp50l