{"Message":"新增预算申请的待办通知","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/页面反馈录入"},{"State":1,"Type":1,"Name":"PCPage/项目反馈"},{"State":1,"Type":1,"Name":"PCPage/FGC_我发起的"},{"State":1,"Type":28,"Name":"ProcessItem/预算申请"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"State":3,"Type":15,"Name":"ServerCommand/创建工时申请审批待办"}],"Version":"v1"}

.collaboration

@@ -454,17 +454,7 @@
   },
   {
     "ModuleName": "PCPage/页面反馈录入",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:12:45.181798+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目反馈\\页面反馈录入.json",
-      "Pages\\项目\\项目反馈\\页面反馈录入.rd"
-    ]
   },
   {
     "ModuleName": "Pages/项目/项目首页",
@@ -612,17 +602,7 @@
   },
   {
     "ModuleName": "PCPage/项目反馈",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:12:45.1820666+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目负荷",
@@ -1086,17 +1066,7 @@
   },
   {
     "ModuleName": "PCPage/FGC_我发起的",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:38:56.8359322+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\流程页面文件夹\\FGC_我发起的.json",
-      "Pages\\流程页面文件夹\\FGC_我发起的.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/FGC_审批记录",
@@ -1700,17 +1670,7 @@
   },
   {
     "ModuleName": "ProcessItem/预算申请",
-    "State": 1,
+    "ModuleType": 28
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:50:02.8676354+08:00",
-    "ModuleType": 28,
-    "ToRemoveFiles": [
-      "Process\\预算申请.json",
-      "Process\\预算申请.bpmn"
-    ]
   },
   {
     "ModuleName": "Notification/系统信息更新",
@@ -2250,19 +2210,7 @@
   },
   {
     "ModuleName": "CustomLibrary",
-    "State": 1,
+    "ModuleType": 12
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:19:50.4805476+08:00",
-    "ModuleType": 12,
-    "ToRemoveFiles": [
-      "CustomLibraries.json",
-      "UserFile\\BaseCss.css",
-      "UserFile\\CustomFormula.js",
-      "UserFile\\Load.js"
-    ]
   },
   {
     "ModuleName": "MapJsonFile",
@@ -2566,12 +2514,6 @@
   },
   {
     "ModuleName": "ServerCommand/创建工时申请审批待办",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-30T09:50:25.1008403+08:00",
     "ModuleType": 15
   }
 ]

Pages/流程页面文件夹/FGC_我发起的.rd

@@ -1,5 +1,5 @@
 {
   "PageType": 0,
-  "ColumnCount": 63,
+  "ColumnCount": 39,
-  "RowCount": 29
+  "RowCount": 21
 }

Pages/项目/项目反馈/页面反馈录入.rd

@@ -1,35 +1,43 @@
 {
   "PageType": 0,
   "ColumnCount": 32,
-  "RowCount": 24,
+  "RowCount": 32,
   "CustomNames": [
     {
       "Name": "标题",
-      "Formula": "页面反馈录入!$D$14"
+      "Formula": "页面反馈录入!$D$22"
     },
     {
       "Name": "当前用户",
-      "Formula": "页面反馈录入!$Q$23"
+      "Formula": "页面反馈录入!$Q$31"
     },
     {
       "Name": "反馈表ID",
-      "Formula": "页面反馈录入!$K$23"
+      "Formula": "页面反馈录入!$K$31"
     },
     {
       "Name": "反馈类型",
-      "Formula": "页面反馈录入!$D$10"
+      "Formula": "页面反馈录入!$D$18"
     },
     {
       "Name": "任务ID",
-      "Formula": "页面反馈录入!$D$6"
+      "Formula": "页面反馈录入!$D$14"
     },
     {
       "Name": "项目ID",
-      "Formula": "页面反馈录入!$E$23"
+      "Formula": "页面反馈录入!$E$31"
     },
     {
       "Name": "需求描述",
-      "Formula": "页面反馈录入!$D$18"
+      "Formula": "页面反馈录入!$D$26"
+    },
+    {
+      "Name": "提交人",
+      "Formula": "页面反馈录入!$D$6"
+    },
+    {
+      "Name": "联系方式",
+      "Formula": "页面反馈录入!$D$10"
     }
   ]
 }

Pages/项目/项目首页/项目首页-容器页面/项目反馈.json

@@ -869,10 +869,9 @@
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "resizable": false,
             "showOverflowTooltip": false,
             "hide": true,
-            "key": "6fc09867-1d97-4a0c-9734-0cf0f885d9fc",
+            "key": "d4a1a2db-1745-478a-821b-49eb6678f9fb",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -885,17 +884,15 @@
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "反馈类型",
-            "sortable": true,
             "label": "反馈类型",
             "width": 150,
             "align": "center",
             "headerAlign": "center",
             "colfixed": "false",
-            "type": "Tag",
+            "type": "Default",
-            "tagType": "primary",
+            "tagType": "info",
             "imgType": "cover",
-            "showOverflowTooltip": false,
+            "key": "79c00d2e-0c08-40b9-b214-98a6bdae0efc",
-            "key": "f7cdd87d-92a1-431c-a81b-53d15fd9ca65",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -907,16 +904,16 @@
           },
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "任务名称",
+            "dataColumnName": "标题",
-            "label": "任务名称",
+            "label": "标题",
-            "align": "center",
+            "align": "left",
-            "headerAlign": "center",
+            "headerAlign": "left",
             "colfixed": "false",
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
             "showOverflowTooltip": false,
-            "key": "3485b7ca-27a5-4c2d-808e-f09fd59fc171",
+            "key": "5aaeb3f3-3ab8-4065-9d70-abfb3164b1a3",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -930,15 +927,14 @@
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "提交人",
             "label": "提交人",
-            "width": 150,
+            "width": 120,
             "align": "center",
             "headerAlign": "center",
             "colfixed": "false",
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "showOverflowTooltip": false,
+            "key": "5e6397e8-f0ec-4f38-8c76-9bbe86ba6499",
-            "key": "ba76d95f-d958-4c3b-a546-f297806c7c73",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -952,15 +948,14 @@
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "处理人",
             "label": "处理人",
-            "width": 150,
+            "width": 120,
             "align": "center",
             "headerAlign": "center",
             "colfixed": "false",
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "showOverflowTooltip": false,
+            "key": "330cc327-640a-4bc0-9c0b-33937c4fe858",
-            "key": "ccb117cb-c757-4e3e-b891-52780819141f",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -973,18 +968,15 @@
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "处理用时",
-            "sortable": true,
             "label": "处理用时",
-            "formatStr": "0\"小时\"",
+            "width": 120,
-            "width": 150,
             "align": "center",
             "headerAlign": "center",
             "colfixed": "false",
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "showOverflowTooltip": false,
+            "key": "30b90f95-0ecb-47c3-a4cb-000730f814a5",
-            "key": "dc989dc1-d92b-4aa5-a4af-3cbbf2269337",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -997,16 +989,15 @@
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "状态",
-            "sortable": true,
             "label": "状态",
             "width": 150,
             "align": "center",
             "headerAlign": "center",
             "colfixed": "false",
-            "type": "Tag",
+            "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "key": "7056af4a-50f9-4ae3-848e-f7a0c542d29c",
+            "key": "b4bba489-33a2-4c45-b86d-8e7d18270682",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -1026,10 +1017,9 @@
             "type": "Default",
             "tagType": "info",
             "imgType": "cover",
-            "resizable": false,
             "showOverflowTooltip": false,
             "hide": true,
-            "key": "7ab62f70-9832-48b5-b257-6363804d95f4",
+            "key": "356787c4-daa5-4fba-970f-89eeed0c3ec8",
             "UIPermissions": [
               {
                 "Scope": 1,
@@ -1285,4 +1275,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//gEPwsmnyWY1qT0SkfvXaPVNZi2N7rYT1W7G4DlsR96cqrLTV39V46ccHdGx4bNkL7VoQEZUhHJ7psQhs/ijlZNGVYtNYnqWF3/LZ/6sMtaKkZxZdjnymmKas0qNT2X9TKCBV35QWsv7WROXpZG291A0v7RsWI6mhQn+YwwgcABtJqbT0zvNoGc3cKfJGurUgLwsE3/NlgUmtJtGi11sLLyUNO5qsp4ne7BBExvzTKbLpVmdBQhckPZAxzjeGDcjxkUSbWa5VQdkRQCXCeYywxuZpV/x68nCwEUMFc9ZGYUPmqprnrt3tkRkBkberrSPgm/4jo31a+245cBiRHOXpvssFjf3Tq39wGne289O373AOjFsX9Qn6I80/3P0LBfHZVC+Vl+KY6a1TVZh72OyrNtunLKpLedvHy3l2c3n3OYEopKhlpc/mlk+mw+5WMT/y0SWl4YOhdKwHA9UjvCookBI4TEkA7yCO/jCYcVON9bOUcnGTEUJPpYX/9tF++w5FCOj80a2WMhHk2uKQz7tccbFGHmx9+pFwghDKYGflTQOEAD5xHeJnf3DKXwG4ZWywFVaPs4iK2V6IerDf26a4UXT1NlUuO1skcQhgfRmdVApjOSvGhuuBRI6mvIhgleUXPrl+8707qljb8FSIpc8bIKYNohZW4pDut9+By4+EPWtoivVvSzFrFmJC7JXLANgUO+AvRWgHmee7pYG8nw6uOn4XPdUrSIerthiBxP9H1Lr7W0uLJEm0715vkdlb2IWgpDSvERfOSRmbS3c9XuSxNCPHchne/8nbKAOJyF+hteefTnimq2eewYJQFqhKx/pbEUok2XWUQFYlmh6ERpv351Z2YPOQvcO6Jv2hRP1zn47Y21KM9sy6I6O0ZVlCkJgVz44N3nNWoZWWUqX2MC0SSg==|920
+}//nv2C3F4BH3mlALlP3laPDlmzzpuPLzcQnEbtuXzCAElM1LFD6+oGHl4ppSpib7GZV6BPfj9REbbKY3ifCyZRGOKG/La2HsUlcswJMAx3uBh/hesxdbCQBnSBHRkAj8INIulaIaujJ2zudMcRnqO6zpttx0OguXuwGPWMmQdLk2Pe9huCGQWhBtTj6vwRO4EdSnl1cZeXQG+jKRTxhLMQCihUqOdcnn/iBJZNyNFllFJfWrsjahpkJd94OSi8Q0PUgIdt6oENYlj758Tc9NIUrobkSEq2JuQLycAwc7oWWPkmPTxHanqJdqRpVJ5azlsOrlYu9ucDDJ8Hbf7lptV2+qT9ibBaOed7TwFGt7qVE4LWhE2EXLfxShTaSX8Hh2Ztu2djH88BBnpcAYoVfoZPcr6owX2SAxWZl6i2/f/eQKP0MNB5ZOzVpnvQ3QT078vIkZoia19Piq4tFGg4DzB1V8UWntGrB8OfhBZKI32OxnWhfNDVJNkACYOJ/pvFELAhrqDMWN+t+rdI4K9amjb3Z9Wr9TQGSjnJIBOlVyYCGmU8ItoYfHDAzoUfw52Uj0/QVLa7zLnc4d87vFUlTjQh1bsJrZ9K7ybeVjA7sBOHyNvo4onEet8Dh/qvJ0kMnyk3K6zWMm9oxTPbGVingVqF+HMM1oPi4SWw/JX2MFH2mB2hQJpCgNn9atM0jTtu8olG5CHb6SvQcDaFL2obnukdFNHkX7YVyzm7CAodIYVlq7glpoLiVnWQUevBBKOPnWfDmU/HwebJBhY7//PHy0pFK+3oaYG5sf9Lb29kaRQIcDk9mW0fcyGdS1zp3OhKNK8VE3VpazMkrgqjvcC9JwLQ8MqULnMiBeBnzhgC76ylyFOYQnfXulus2UA1aqOvJ3TgNNXcIK2IVeVPm7AAMg5CtQ==|920

ServerCommands/钉钉/创建工时申请审批待办.json

@@ -0,0 +1,245 @@
+{
+  "Name": "创建工时申请审批待办",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
+      "Permission": {
+        "PermissionData": {
+          "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+          "permissionResource": {
+            "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+          },
+          "permissionBindings": [
+            {
+              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+              "roleNames": [
+                "FGC_LoginUser"
+              ]
+            }
+          ]
+        }
+      },
+      "HttpMethod": 3,
+      "Parameters": [
+        {
+          "Name": "单据ID",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "7"
+        },
+        {
+          "Name": "待办标题",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "7项目正等待您的审批"
+        },
+        {
+          "Name": "待办描述",
+          "DataValidationInfo": {}
+        },
+        {
+          "Name": "发起人",
+          "DataValidationInfo": {}
+        },
+        {
+          "Name": "执行人",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "shamus"
+        },
+        {
+          "Name": "流程任务ID",
+          "DataValidationInfo": {}
+        }
+      ],
+      "InvokeTriggerTestData": {
+        "UserName": "shamus",
+        "RequestTimeout": 20
+      }
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+      "TryCommandPart": {
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+            "ServerCommandName": "Basic创建钉钉待办",
+            "Parameters": [
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "创建人",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=发起人"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "业务ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=\"反馈-\"&单据ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "标题",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=待办标题"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "备注",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=待办描述"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "截止时间"
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "执行者",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=执行人"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "参与者"
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "APPURL",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=\"https://www.yugasoft.cn/clue/处理反馈工单?id=\"&单据ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "PCURL",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=\"https://www.yugasoft.cn/clue/处理反馈工单?id=\"&单据ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "流程任务ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=流程任务ID"
+                }
+              }
+            ],
+            "ResultErrorCodeTo": {
+              "SerializeProperty": "code"
+            },
+            "ResultMessageTo": {
+              "SerializeProperty": "msg"
+            },
+            "ReturnPropertiesTo": [
+              {
+                "ResultPropertyName": "TaskID",
+                "ResultTo": {
+                  "SerializeProperty": "待办ID"
+                }
+              }
+            ],
+            "RefreshAfterFinish": true,
+            "CheckDataValidation": true
+          },
+          {
+            "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+            "ErrorCode": "0",
+            "Message": "待办创建成功",
+            "CustomReturns": [
+              {
+                "ReturnPropertyName": "待办ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=待办ID"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "CatchCommandPart": {
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+            "TableName": "日志表",
+            "UpdateType": "add",
+            "ShowConfirm": false,
+            "UpdateBindingValues": [
+              {
+                "BindingInfo": {
+                  "TableName": "日志表",
+                  "ColumnName": "标题",
+                  "GUID": "2927f1a9-ed78-489e-965f-d40e09fcf283"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=\"反馈ID：\"&单据ID&\"，创建待办失败\""
+                }
+              },
+              {
+                "BindingInfo": {
+                  "TableName": "日志表",
+                  "ColumnName": "内容",
+                  "GUID": "fc080bff-2cc6-44e2-840f-be916982f139"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=ExceptionMessage"
+                }
+              },
+              {
+                "BindingInfo": {
+                  "TableName": "日志表",
+                  "ColumnName": "类型",
+                  "GUID": "399d3da6-46f8-4436-ba56-2f9e2446550d"
+                },
+                "Value": "错误"
+              }
+            ]
+          },
+          {
+            "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+            "ErrorCode": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=ExceptionCode"
+            },
+            "Message": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=ExceptionMessage"
+            },
+            "CustomReturns": [
+              {
+                "ReturnPropertyName": "待办ID"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "ReturnProperties": [
+    {
+      "Name": "待办ID"
+    }
+  ]
+}

UserFile/BaseCss.css

@@ -7,13 +7,13 @@
 
 .box-radio .FUI-radio.FUI-checked {
     border: none !important;
-    background-color: #FFF !important;
+    /* background-color: #FFF !important; */
     border-radius: 6px !important;
 }
 
 .FUI-radio.FUI-checked.FUI-focus {
     box-shadow: none !important;
-    background-color: #FFF;
+    /* background-color: #FFF; */
 }
 
 .box-radio {