diff --git a/.collaboration b/.collaboration index 847668a5..9bd73e5a 100644 --- a/.collaboration +++ b/.collaboration @@ -257,16 +257,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9304802+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报子表", @@ -274,16 +265,7 @@ }, { "ModuleName": "TableView/成员计划内容合并视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T09:00:43.0099435+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\汇报\\成员计划内容合并视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/message_test", @@ -444,17 +426,7 @@ }, { "ModuleName": "PCPage/流程中心", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T10:19:41.599792+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\流程中心.json", - "Pages\\流程页面文件夹\\流程中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的待办", @@ -870,61 +842,19 @@ }, { "ModuleName": "PCPage/日报首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9346841+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\日报首页.json", - "Pages\\汇报\\日报\\日报首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9360621+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\汇报详情.json", - "Pages\\汇报\\日报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9347403+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\汇报详情预览.json", - "Pages\\汇报\\日报\\汇报详情预览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/导入汇报数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T09:00:29.2293404+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\导入汇报数据.json", - "Pages\\汇报\\日报\\导入汇报数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/日报助手", @@ -1208,16 +1138,7 @@ }, { "ModuleName": "ServerCommand/AI报工数据转日报", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:59:33.033231+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI报工数据转日报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/AI内容转报工数据", @@ -1229,29 +1150,11 @@ }, { "ModuleName": "ServerCommand/新增或更新汇报", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9378406+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\新增或更新汇报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/AI生成周报", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T08:58:15.9379719+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI生成周报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/AI", @@ -1667,41 +1570,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-06T11:22:07.1914125+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\LottiePlayer.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\加载动画-10_0_2_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\甘特图-10_0_2_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\表格报表-10_0_3_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index b2ae84e2..0ff4818a 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -227,7 +227,7 @@ "ShowConfirm": false } ], - "ID": "132164f7-4931-429f-8942-251d429e12e9" + "ID": "ca05b2b2-8400-4f9f-8276-35776e4707a3" } ] } @@ -611,8 +611,8 @@ "CellDefaultValue": "日报", "Items": [ { - "Value": "日报", - "DisplayValue": "日报" + "Value": "总结", + "DisplayValue": "总结" }, { "Value": "计划", @@ -762,7 +762,7 @@ "ShowConfirm": false } ], - "ID": "7c3723ee-16d3-4f22-8d34-634ad9ac6040" + "ID": "9fc3d003-d925-4989-898a-64fdeae54132" } ] } @@ -849,7 +849,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "b2f2350c-e633-477c-85b8-cbb4a1599299" + "ID": "5af87157-e4fd-4a37-b7f1-f2496dfa8cac" }, { "CommandList": [ @@ -863,7 +863,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "cab096c7-52ab-416f-9de3-0d781296b6e1" + "ID": "1acc77fb-7960-426f-a510-03372106d7df" } ] } @@ -1114,4 +1114,4 @@ "PaperSize": {}, "Margin": {} } -}//mr3kYPQuxy2b0hZlvH3Y2GIIHxFCZ8Ucquh4r0z723lawJSVET5Q0GzNPOiDXErB5weRXRdeD7HLCk2g+zYt0UfvJxHHfRtqHK0iS227dTHnKCaO5uHGuCQJfswaBhtH3yfanDmHD/H2WTERl9BIwa4fhJx1RFhz1h7DZlY/lgQspspwCOIgDf1yTeUyyImqowFwuwBIlMJ0XhQBn/Sqmh0XvUfTKcRiwImNFRap6PyStoY7ZmQ7pbdd7N24tpsqVeCZ63R5vGNSOT51os27KHaa5EFnbrm/Z3Xn32FdqYQ1k0JCVXnWKcXunMighEJhZDDVWrEAE1diClbSNnNX96+DU39r7s0Ux8lFT5Xxe/lPrOpqwoK6Audt0ny7G1XNP1CzoyOoRlfokE2LekkMn9tN6zglc752LB2PdrvuR26ZR2sWC8xpCicbXa7jJaXm46VDE0Yxl5tJxIgfunepGpFBAHqcayEHZiCwSxWVc5hJGphtMe7LzDw0aCJvs7gRSalnSzzXdKS7i3pCpB5cGwx5BTaKtVt86BrxrwwCdzvANyDvoaloXavaCwatbLNjVYtNCpoiahmhVnPmX/EM+JMh2JYvXGgPrD4qkkZq5/mqc0dunXyyepf8vYKZAXbJ5OmzBZPPSCaDK+El5Iqqxg26OpYgpwBi4CKBifNXNXAaG30U6U58vPrZU3GotOjSjTmenRn11FATinqbdjScx+qRwEvw200G5shRnFZyVusvQztujChTIgpDU5hTb49Zhr+ZXp0QrVq33EfEJ+eHNDNCjH0oGKU4hpdnC0HMnZ4BYu34X6Gugn8YdFyhYGpbJmP3t+DN3O5OodrzVKKKu5eHdSkz7mxtEWzIP2pX/Vo4O7OcQl7ulObxNgbTmgYZy0k09iyuY/Z/FtaDoZG0TQ==|920 \ No newline at end of file +}//tW3xxfFRueoYB5f8m24jsESwhwkyJ6FP0JGWvDQaU4hZQmXDsAgL3Ny/ihWDKZ1PFregvEc0BqJFbzcNHa9hVdrVaTsBalUzi2M0bzAUumAiARDmf2tYnnv/nDU0T1MpJ6UlJYmaFm7R7ZlxrtfLSKz3N4QMXTWfxvH/bc8XbQL4tYwnlz75A58yi3kWtNf1RvWMaRqD/ucujpwPehb6YlBoo4xGkR0HL1fSzYJAie6V+Zu7gjLh7lZUNUjYQI4uXdy4Ittxb7vrmBr2DVFsO0QTakCa2752RYsoFqusmr/Id8/i/XQNjlMqUfqUqzYwhFniXFkUTzmNITtL+KopSaIU/XeHc9OspyQ5OG3di02turVE+Eg4zqKmMkK8oCFhYnvj/DLANXeup3goNhMMVcFB4qEz92mf8/jymRw4X0Up2TRMp3sF0oNzsgh7JbXnPpq5kOvwE+WUri2CLqRz8bqj2e77J7IsRjUGLsvJmEeCVMheALkQVriUDAW+wYfl6fjqls8IvS8QG1xGqCSEVgdtvcj6WHsWqnd26oLcnkza20BcQ7ZMaxvlsGaHy9V7IvI8uJPEqQpyevNgzkKnsa7Cz2j7rpEEsElF6zIauJshzWsBKzz0LPig7MpGeZAbtHOhUBCbRwsadHd5r7DuReEDn4O02KyoYI5m0KuUMwj0gFWejgRLdwEjX/q2BORXP3NdTx8fxTBlNiClvLGlyXAANT9WMzoKQPImQ/xDyoHaQ50wrM0SRcx43dalRjHRODxr7/puCJ9w37QGH+6RO3kNlM8jsX5EpyBI5Kp6VNLQJ57px0eFalNQdNQXAvcN5A3HO8TRU2Rcecfm0C7MwfXSukFfoA2D+OpujoaPyKWylhfEH16OXd5JBUBSyJKIYt6vjBQCwpLhFTwTmKERBA==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/导入汇报数据.json b/Pages/汇报/日报/导入汇报数据.json index 4fb40a41..b71aa6ce 100644 --- a/Pages/汇报/日报/导入汇报数据.json +++ b/Pages/汇报/日报/导入汇报数据.json @@ -221,7 +221,7 @@ "3,21": "类型", "3,22": "工时", "3,26": "关联任务", - "4,21": "日报" + "4,21": "总结" }, "AttachInfos": { "1,3": { @@ -348,7 +348,7 @@ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" } ], - "ID": "611cc80b-3537-4ce8-999a-cea5fd62ace1" + "ID": "960bc5a5-99ca-4b8a-9b9f-9d00dc89397b" }, { "CommandList": [ @@ -358,7 +358,7 @@ "Message": "请至少选择一行进行导入" } ], - "ID": "f129150d-e6ab-4d17-95d6-8e4f2b2ce039" + "ID": "2fb768da-ff5a-4a0e-85a4-b43669b5b090" } ] } @@ -484,7 +484,7 @@ "BindingInfo": { "TableName": "成员计划内容合并视图", "ColumnName": "任务ID", - "GUID": "d9fb50c6-4609-4796-b08e-2586eea25652" + "GUID": "879bb0cb-a1a5-447f-9df9-44f5241c1d85" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -686,4 +686,4 @@ "Formula": "导入汇报数据!$D$2" } ] -}//21imcMIAmtV6L3mPjwRjBonW7HrFsZBg8tMVyNFkQwoRJKcQ3qg2sjPz34bnoQp17v3J9z4rXkXzYQ2cA/tERdTtFgHR7ve6ZTYhWaYQUH7DgrNYVGiUwdZmrJ90d/h5jYgB/VE27gVk33RD6MvqdxV8Tt57yioBc77PcWRRCuobEdhvs+YKmp4tT7TNs40czEqRvrfSutaAMd5Hre4rXk2xDE6vQKVo9LyDyMYQpBTOnTl+xikwVGkF51kpf5i/SZwv+Ja3ql02dbtFEBX0kzfgQSMhGBgR9/ARnmyHFd4ZgSfzu37qgQkfs03j9kNJpZV9eVmFDh1S84kJlE/OVyQGWSVZ4QrJq/2IN+oCGwM3dyG1b5lL9pA73dw1qUKA16tWb2SonBVqpA/qXg39R0HdKqNs2pWCPFn4IH+9le2YDnNoO3ERIR8vTy7XHvtIetv+UWaZJxeuEdo4AJHJ/UR5BubHE9sKZiYGA8xWTVNp59vs5EGSdkJJWilNm5yAWJERu019TWgrgoUFP9loekVKTlhPXPbrnyBg5p0zcpszt6qpJgRzFgU4IUpEdCfnGCNzuv8Wns0i/3MHdN6/qx/lHikZ6e1syCVaCUeSuVEPatm1xZp1Kcis6H6GNc9ykjaGNuY8A2lbGHFh1eJwpGU4J+qb7V/prUVLaPSLMa0wqsSyDJE9QvIrOBRaLCmQwHvEgGJg00LU7cEk2ZHvchgDvdWvJstayqxYifjGA5InSpjf3qwfbX5l2Cg4iVOuKmm37tTQGs/8G//pujoYG6Rm+u6TVmbqIiuqzOQ+yJ6E0G9SXprftyJ198oh63t4iVKn2/qKhJnMCTKumPm4lbYl9bck3Cuh2NGnpSzTEu/x5j61da7Sj5ShMMWloz7iHEsVx2kKd7pfil9vWa9c7Q==|920 \ No newline at end of file +}//QqTF2CrEzFQP5Q7ePc66nLz+j9DcZa6ED6EHkwpFLlbowt/9NxneUQsg86AFFEBl4HwrRDPwRY5FawujzXvMJrN2MNH+bCIggXUaaRrhRGPCM2Cd2eJ1Ejd7u7r9nzHSelbklHI1UrU8AlXdnLEnIJqfw1x4EnlP3KCHgdBMs102mDhWoZ7Wrn9B56C3wScaGD55V/RNFvl9/gRsktD+o6ktwW7m3srJG5ty8N/tnYvaf08C9KdG1CpqkaHmxZZLSnX0briE73Of6teCK13Y3D241yrscvJwt/Aa3Ig9sUJO4XAOJ8L4yG63CY3cs8BiSOk3SsfJAFt3nvOAm/W2Bh9N48VcVU5wzXJTXppSiSgZDBhwclBtkftzacvX4W8/XQwEnITcgKSROJdXukEAyTKltUVSt1mH1tf+/c5hsGDdYE3jrCkXM/h6H/2mOxo6zQUattEamnzumTP0p+lFs75EKVvJWFuZo0G43X9JGsv1BxOpQvJb+Rg8gEDYSYUKsb2aXvYFUL3tjltzCCLXlbCVVuc7iuevDwWJ73HZhjRDKP7PKnPuzcPU4xzzZpWWp7czf9LqqM7K5CjkOZwHR5oXTPcJh75WsTxwbcdTgz9VBFPB26lJYz1BdWQVuU6f1ppYwi9QCDmHZ96Hl+8xG7lervrjK4Nb1XbKhmkKqYLvXGL9jJ10/wz2GH+7+yJu/LZVZw5/kG/0h+S7v4l0i6vs5zfV2itmTpXuEGSZ0QoUwnHfu5baE0ItjMF0Q3XWRSKaB1923wZm4djFzMWrJ9lYmdxnj++YYGFaeeORyUKlQUIiRaIoAVTrZEryAxFhuVElCjdw9drzvb1fl7nZcNR5QHwyIo6v7tJapvceNaxrBvAwGemJZGih1qGxSLTT8xqxQpDzg2fjOCLOUTBc9g==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/日报首页.json b/Pages/汇报/日报/日报首页.json index 77e31351..424d41da 100644 --- a/Pages/汇报/日报/日报首页.json +++ b/Pages/汇报/日报/日报首页.json @@ -303,7 +303,7 @@ } } ], - "ID": "0469eead-dab1-4346-b55c-77e2f11b3984" + "ID": "6c3f10a5-b188-48d3-bc7c-2697e71b41ac" } ] } @@ -340,7 +340,7 @@ "GUID": "a70f65d6-f250-4335-988a-e42dc34310f9", "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "a5cded6a-8fc4-4345-9ad6-ae579840a8c0" }, "ColumnName": "汇报日期" @@ -397,7 +397,7 @@ "CompareType": 3, "ColumnBindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "a8bc25d0-697f-4742-b895-27962ea6cbd0" }, "Value": { @@ -410,7 +410,7 @@ "CompareType": 5, "ColumnBindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "c5bce83d-3340-4b1a-9d35-db98b753ecb2" }, "Value": { @@ -434,9 +434,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "resizable": false, "hide": true, - "key": "36118757-90ba-4299-8306-c836e9bfc880" + "key": "36118757-90ba-4299-8306-c836e9bfc880", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -447,10 +458,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "8dea6648-dd12-4a17-b65c-b73449a4c96d" + "key": "8dea6648-dd12-4a17-b65c-b73449a4c96d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -460,13 +481,38 @@ "align": "center", "headerAlign": "center", "colfixed": "false", - "key": "850a2074-4440-46c8-935f-a5a23e3344eb" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "850a2074-4440-46c8-935f-a5a23e3344eb", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } ], "showActionButtons": true, "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "编辑", "styleType": "Accent 1 0", @@ -525,7 +571,7 @@ } } ], - "ID": "da09451c-aba6-4248-9b83-e6d360f7e59f" + "ID": "eeb1b6e2-dfdf-4777-b682-c2af0d61fa1a" } ] } @@ -545,6 +591,20 @@ }, { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "删除", "styleType": "Accent 5", @@ -796,4 +856,4 @@ "Formula": "日报首页!$B$2" } ] -}//LeomVd4vT0oHnJ5JhR2OxshICZeIml94RaE+0J9quC8gZL37SviZX5ukrOKGaEOUMZcDs4LS7PN36yqJKLcI9ix9IRBtxBsc9bb2yGWF5nVJlfplIh0E+bZGgzsNx4NWeDGU98IfWFsTjoe73PA5qXpEAOHuUFAUALgAFjZFgqr8yQcf98PnNPtLfCE4UzuGWkec3Xy2PS0x7TvhXvky1hP5Nu/cJJYqYgzuqXa5JtFlHcfNohgRvmH5E640Ya63OcNLUIpxUuW/qkKOwVQQcxx3O9ST2Cs2GC2rZ+uMLW+B6NkWunEr8PE1pYk26yZRflWpzq3XltG9vm10xpRO/+wxbs6Zld5ZNKRvNNHX7ZtD2MPau7U8NWLzmFTQvYjZKJxAr2L4RWCt4pHx/xtq8cRoYkxcSvO/TdwY2qTTRKDtZdvb6km3ZFCh7B9c13x3tdpSVDmGjm4lT+S7YidbdC8bdxowfMwOSuEAdn38Lr0SIw0wn18V5/71iVDxQGNLfuR9rBhnBdvvNX/jtjLw86dt7vhEfZhRCKg9mdcAZJWrpS33xls22aevtG2QgXf5ShhWTAWWSQMWNT8RCV9Ub6SI4ME7C4fjmu8GA1z+NqeUAtno83pgbZrJjMtNlptsneLhAYk7XOTMa507/614unJp2GiTkB9/RtOnfIyTAy5AKMQhNe9SY1fuOiRkGCMVE8PlzXX3fFC6fg3OreIyIv5wqj4hTVvqh0PYVMj0x7OvKjomjww8+DCP01HffS6GrdMVbDS3c1wh/OFqI1N0Jmu5q8gAveciDYw7Bz5MnpSTrTElQk0BsVvSQhK0p9pxP6SrtzijlALhz+TCbm4bDORnWFCSxD8t6lilbViK5C0Ao09E6h+YWbWnv6Kvt5OKIUlaworWxGK0SRg3vFqUOw==|920 \ No newline at end of file +}//Wn4zsrJ4Qav31fPk15OCI8dD8aLLlCH2FJFtlQVHgkwFh+48gQeZaQwa4PuM8bJneMsI9ahoayNNwXKNIQtHV/Om2HtFy57FLvV5jw/1QqIr3a3ub92efZYUqUddQPaiP/TNRaeoXKlBlgbr8iv86pNCqg6KXUrwQyT8Vpyq6D0c9ZtkEUU8S/9w/FWoGFJUR40ew8bX8CH6dwJ1ssMPyH0h0tmO5j9C3XE1sxOpXxY8/qWilFntcRyxV1nLGZRj6gHLv/fFpGTu12K9dUHsAsn8bj7Cj2zi4LCvAqUjbSKHrArTmeM3rYxKtk8iIvWvvCfRgZWjh7LJHhDVl6kUAN+QW193kkeLHiCgdPEbFqcJ/+3Z/xjVZMFWC8tGVLdMDoJQ1mX6IiJAJojx/SY+WfoiSBoEIeLYJZRcNg8QtdskFyxlK+10T496Q+gDa84OxDIVYneDdm/S/M+r7uobshK4lvpEnuPxD2tmus1AzTrkDsryJFu9grHzVscVVPM8xXbL/X6AQlYOlX//FwLIAofaMkhr7SMiOUn4GY2qvdqczYsbetyFGmHZl28sJ8mpoTXCgOIomdJPzhYLHqhl5NUiyvTHSZu5UjrznLGwY24ViTpMvmEQhJ3gONCoU43TVXb23zY/vlyafkF+cKV5/kUX18j4mbAjKHOu+E1cXAglpEujjyStN3rIOwgR86lFLO72+/kku59moritsu1aCkZph29kzVU7u3Vo+2RsoZuCUKBNlmouHLaZ7vrFXwPW/dRiYRo5qeq3w8nKNTk0PbswTnz9/5amrStb1zE854FVZk7KRm72E19q5jTV6TKssVbqZG9CF+rSiKrjzoO8979dyKG0dawV5z7jXoPVpNRRaLCEEUXeeFKemgYg2RZeR9N/s2NIhwK3g9WJEH0k2w==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/汇报详情.json b/Pages/汇报/日报/汇报详情.json index b0fa87f6..12969b6b 100644 --- a/Pages/汇报/日报/汇报详情.json +++ b/Pages/汇报/日报/汇报详情.json @@ -348,7 +348,7 @@ "1,7": { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "cc950af0-d8b1-4232-9ab2-415985e67f81" }, "CellType": { @@ -535,7 +535,7 @@ } } ], - "ID": "b944e828-a6ad-4612-9977-9987092d7289" + "ID": "22d401c4-075e-46ac-8d53-c01964d53eff" }, { "CommandList": [ @@ -550,7 +550,7 @@ "BtnText": "知道了" } ], - "ID": "76e6db88-46b7-4740-8c2f-03083d332c82" + "ID": "e00a0903-c6b3-4a75-89be-9a65737a0047" } ] }, @@ -564,7 +564,7 @@ "Title": "生成中" } ], - "ID": "681faf08-502a-465f-9892-c4cb3d1480e2" + "ID": "8ff5fe47-a590-46ad-a477-30e89d14fd9b" }, { "CommandList": [ @@ -574,7 +574,7 @@ "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！" } ], - "ID": "958874a5-9b83-439a-aca1-d21957266352" + "ID": "1ae94ed2-47e4-4e3d-9522-12f7b5927aae" } ] } @@ -744,7 +744,7 @@ ] } ], - "ID": "c58689da-c8a1-4d90-a41c-ae93c2281ea0" + "ID": "3657e756-4de1-4640-aa52-21c544d1c47b" }, { "CommandList": [ @@ -759,12 +759,12 @@ "BtnText": "知道了" } ], - "ID": "62810fe4-93ed-4595-8d01-73c1f8bcc31c" + "ID": "e18c9ff2-3950-48be-b609-e04a84266893" } ] } ], - "ID": "1d13d5d4-b473-47b9-af7e-7c4c49394330" + "ID": "56bb2ba5-fd5a-4d22-9686-6652c0a1d5e6" }, { "CommandList": [ @@ -774,7 +774,7 @@ "Message": "请选择汇报日期" } ], - "ID": "d7ec8d15-82b4-40b1-b058-6178c5576cff" + "ID": "7f1a5080-ca94-4460-9229-a1d5952d1368" } ] } @@ -1141,7 +1141,7 @@ "ReloadData": true } ], - "ID": "f836b7d6-8d12-472c-a8be-1e078c7cab4d" + "ID": "3282480f-9770-4355-8da1-75cfe6c4c796" }, { "CommandList": [ @@ -1156,7 +1156,7 @@ "BtnText": "知道了" } ], - "ID": "b14cfcb0-61e8-4363-8dc2-52603c88ab07" + "ID": "70d9c3a4-2c14-4438-a69c-d8e9f35f08dc" } ] } @@ -1559,4 +1559,4 @@ "Formula": "汇报详情!$B$8" } ] -}//ZtBrfOSeQCPPjFVzkZ2R5fWZ5JrVl2D+uWBHGTt4NA7Lhqn8RFa8j+kP07DOHh+gApoR5q/suK72rbSbFQIHnSEEaF/nZSfT350PLa6Li6ny+6gXV1kc68tZ1VkAf8wuVcBzKkKAKipwfWuPAmZpgqD1fb+A94TOMLVXyeakzg1Bei09jT9Iic+5gClhO80uUgXLRDoDyaSVQA9RFLae5nuXoYPBG42gcF9Bc6f66qPln3RYYUjfOMBMUdBPPtZIgODK8y+uKTVzVYL135uAHz4fknh9TFlueXwzvAlfG9nj8W9tUIsCvr5F567Yb0ZdtrEvOfMM+4iDxWiWI6dwYE4/8Cpg/i2sZNi70OfGXM2q/yMdTwTq/1FIWv+89jvQVXGbtatDmYJVMFp2V6V05eFYM8VcsqW0QXo0SmerIaFWmdlEoU+ENBgChqgxwk++J+2MfcxsOY5H7Nw2j8lFJmgyKa5Bjz9hzCpoqxdd2ZUj+jQhiEMzl4pEeFIEADpzyBmImspmofqX/f6E8YqkAyYBYKaTwbBoinmtlXqVYqMAfzVyCz1rsRarg5G31mARa9RWXdyhQpc0/g7vistzYQ3iYgZr3/b6yXzK+n3xDF0T8godIoDH11rbOwXaQE69TkgbTmkN4lKnIJbkwBQpnM3F+Vp6N0FtdXlO3mv5hRH11NfaF3eOvSJk/NNjVQIBDelo0Y0ITbHw3DtJ8cRRaNmuFVfcXjpHptxXYeyYJSNeWjUhdDo0ggAMXzZTDAE/nJo/un9J6WqHCsqlsYITdpCz4HzyWJ9uQ1T7VecTGpP0+wRHn9asG+tiLKP+1wKPIQoHjxiB5939BTl+e9cshOLm49bXa4/XiqHHzS4cVYjIRcAhrQPJ+5ZM6N0PBpMPUra9yBiO3tkfEEgbusekGQ==|920 \ No newline at end of file +}//Suq7ZdGmBnmFVTJQyBc0rUAF6LqRdkOEvVu9A6HHAaCkKWojhYowtBmJPnQwhz2iZuouvBoU+5OlTfHJ0bcLHEVRuQFl+X1XvnIBNPXLvfNIFNphzyqaVclQKiswS4NXErq9/9TE3jh8j86Lo/PdqTIKWnkKwarSXZVvwJT0JvJbN+ZuhJsgj88cTNPIztGAefKTD4T20rGwU4BwT4O5XVZDrUcRYJBGmIfc3itTQvNTT5Scop0zusBud6IFBdoyzcmv1Yt2/HemO2X92ElilenMbxO1lClk5u0iihFh3HNDX/UXYEQs9Rsttz8IwyNnL3gRyjGpcwOwuCfOBMS3ed6ZF8NeUVtdf54zR2f3EBHEzHrpbNerV8p4ih+yAEjbS97ppU55u6EaRU9D3qagnwmVOAFgUC8TcBUfv9SyXYHvhBm7Xtv/F6sNZ8BaN05741TgMXHTMSXgyWQm3aUTRIfYGY2Wr95DM79QHSnp7q4dYv5vEKU2Ell2IunFcVcciOkPaBUlFHPabEjfrBjct6dsD9my87O3UesyGst9zlgS8V7/c/nK1TZ/H63Mx4ZF0rRpSU5iMxmLLVtFGtkKt9O47VbCfxawcdonoC1tkhb1CFk1nPK1Ywk1ipWGfA4dW758xaZE30JYUxh5qFTHc8zINLD968taqP+DZVkmKzhaKvI4X/4rBHFkSMN4/Zji2D40gjxxte7c1a9NnfZToOa268WARiUDk333zjPBFEsOPEVF8yFNDIUJS26KCGaiU7TJ9rF20t2G6fm9nUmPZ1YELgof0z2BmFE/5uFu850JIrCWlT6+e+5pbP/17nkeJkbKgMN23O1m7E6AnZhGYpNNGUWpqfRxk5O+9lmJ/hwJbAXdB5e4Z9cYa7BxLklB/yRR75yfMycWVOR9kmiaQg==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/汇报详情预览.json b/Pages/汇报/日报/汇报详情预览.json index 0b6d92af..9fd59bae 100644 --- a/Pages/汇报/日报/汇报详情预览.json +++ b/Pages/汇报/日报/汇报详情预览.json @@ -161,7 +161,7 @@ "7,1": { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "d8621d65-c1ac-4a36-9109-eb8c7cc1fd20" } }, @@ -224,19 +224,57 @@ "align": "left", "headerAlign": "left", "colfixed": "false", - "showOverflowTooltip": true, - "key": "b2bee9b1-a314-4ae3-b990-a403b9ccc644" + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "b2bee9b1-a314-4ae3-b990-a403b9ccc644", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } ], "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "编辑", "shape": "default" }, { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "删除", "styleType": "Accent 5", @@ -426,4 +464,4 @@ "Size": "3,18" } ] -}//AOQGgPzeGd0pL6g24s+lKd7iwuusNEcIS3MImIH/3ai77g7cnqk9aJnsEqzz2i2vaaBUiajH5HDMdmNmaRCao9LUV/BuTWzhnqeq3TAEzUel+8qrKyCThw0epoM49DUdNyRAhLV4CCGoLSX6OM48o7GMknaZ+RuQiZlpoyVWsj4pjELU0QpIkq4AgVF7G18WG+BbR1eoscYxOKcb5lsegTnCCuQAFyBQLB2RnkMbEyF8MtXbel7NCSa/NMbseYgB7Ndd9wYsfOAbz70tq6x2rE5Niw5AOC9EuKiY1ifkkodOOSgvlpea/ZotywhCm4tyBDqWi461bPeZCvy8Ug3TlnlHrXL7LU+1bzjwJkkXzynNmhLIhW/ulOP9G10JQmQ1/NhymAfHWrpqqt2WQHN5/nplNzKiwCGBcjY0g2XuYRbBNdsOBZPVCjALGLHL9zVlUHehncNFgLkdKwQhRywBhz8y/KfZU4ohNDifi+20MoXm7+VpoS7HvBQNd3x89g94sDb8s6LfMFp4QOt2BT7kSTbdKzKi91Cn2WhQSzF+reR/K3PZXP0bF22Hx6AOQbs07OVbCpYtCydN24TOKuIhMt5GJH+UiIo+eBhhWW8chX7FbKlBN0fHk5i5NyIYMOrUKDwO1pfWxbGHirprDG81bdHXZcikRPIOjTPOdEPWYOoCFrKYDCQZcabh3Jht14WHztdMWGZhxTCV9FSCdFkpTGaD3biTQa2bin3QfPtIWMR6tHETWHGhtb6i8jJoXas4NQHgtuRkoxArCFp8ALI/HQt+ooZeKK7qTscbX027ZF/vXrmm2YzYVdVCZ+HsOIy7+fwbvWNgIq6XqvOcappSrXOlcyVj/lKgTO73vEmGUdxIZlT5jtXAeUf9qcB3PS0rcPgwru3GF9xHAQYuFQYfgQ==|920 \ No newline at end of file +}//y8S5UavUL0E2kwFCwGcEnj6HeuMPK/POQZEmyUoqrgdMAKDsANiBKITRBTzaPN3lhnJc+1h7B+cR08dQWFBwbNVxF9fY+Jm3BUkWK0SJoPHNQqpYXS5nbkpiKs3UMgBKE9bwP+UVEWL1Mqljia17jdePekOPQfbTKzQkr2yvc5J7Fnc1m2msd86P7E+NMOcw5p5xon4ZqfXm871koVcj0L1SxIeEiu4z0l/Q8fOXnve78l/YXFEB8C/m90ca9VEdYX8Q7VQS67tSpMw4YJ0Ga3hR8DwyuT0VSlwemaqgIFN6LT4GPvBYjypSvbAgiPlnpDOXWAjnl7XHIisgKI0fYz1ojExkMFfBCffYzKUOMfdftsoYtJJpT6z8FHe7QdE4BnkFqYz+J3GpvmWO01yyVn0+CIoGhUxLxr8Ysxd5e7q6aOKRxzGdrowENJaBuJy6IYwNG4+K/MPMO4WQQt8wIAKdrsxyGO1Pjaoawh8siZiJ5fjJjuJ/9YfR5iKy26VnSmI0wVzo+XU+CveFlEyhx4epHTEXDu5E9saxULGqsmU8tv5HJD7XKXmUyPWdH7GmsafA5Sd86oWIASBipSZy/Mi362MJvRTWwlRQjSqbVkPhHAwfRAHXPQ/GLjpwCYbifdC3UprLA5oc1ou/7krCTf34LFou8YQD8sWDVFHfziLI9CAV0GkHxj0ie93O4s0TijL8Js6abnoIUGxc2T5rzheUmXUxzFxEgD8Om2/MLAdddGWDaQXI/hk/TSMLf8TL5AniwYAkdHdKEYpODzZmlbRATjajnh8iOTc2dF8pRZGvQhY2JmSBEQiZaZMxpKRVK+tt6ZWbjprtc7Pzq/nLisrhedJ6xNyC/eYTSRXgjKfo6l3vah/Hl6Jqqa06+KLL6IoKjpYMHpBnQuiT7LOkcA==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/流程中心.json b/Pages/流程页面文件夹/流程中心.json index 1404861b..d131b776 100644 --- a/Pages/流程页面文件夹/流程中心.json +++ b/Pages/流程页面文件夹/流程中心.json @@ -610,6 +610,13 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MasterPageName": "FGC_母版页", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -637,4 +644,4 @@ "Formula": "流程中心!$C$1" } ] -}//6fw8wwbpn/rsZ7vxIvw82Dql9wD/EhFRhyLSemoV9mzSICzBAtrx4fWu8jVdFUXOUcVJTDeQwqEER45IInHKsRe4rzCr0nzHPKCR8abAeG0jhC+2Ug3Ngau0dQyz11T6Xz2tQuQy5O2Dh90du+LQdIvg7AHp6phaBV5zn4jKVsUuaAbj99+LAe8YQ6BHFAvC3QF9ral63d8cms7kInJYoyLOwvTzh3X9yYM7QrwAx9QRFPUUujBuPkhwwksfyVVB+Tkr4HWC93ffMoqPQS5QTrahiBJ4iADx9+zqU9qrFnUQo6d8OzORwgbtRl2oYkYG+dX7yKkYU+fA8nWvctZNG3iherxf1Q4rFo3WPEdbu4FVcr/Ptsc3wRJN471BphUONLG2ZmINvHvb7iAMsToSsCXU5lApp6uioabNbDGSlphPfJRwbx3arY3PLqlMFm+bsoZcooxU2j5jydInRMQBljbB1DaMBiI+U9PsecA0y2lTviVvVxUKOGkOy5r2Mkinni2BsRlgG8lJ3vNMLlvDCe/TKrYMyVjHfgbFjjFYib0JTo/u9FhUfiHzdLv3SiBNQzKeBPjq5S4M/GlCIJxFeMFZvIK2AVWTgrjkUwsqnXA8LAu8ZX4sTPJiycdg09lGxIAjGhWU2vHw8CdXPsiLDe3osKR1LemIUaWbSq+2G/PEICJy+EUU8HAe8zRsprL9+5r2EotZK12i2sp9ggf2cmDigr6VpDf/MFlg6iQPtZsKVJ/JYvnhwKASCHYAITl1RiyoznDmx6/e2BO90GjOCb/SqfkKruVf7h9tZT4YNzZghm2ZqSJTStTLKGvTiqURUAsqntp48kZHbivR5t6crB+DGAHuVwA0t+Pp892NhtQplWuC4O5edHNxVunfmMfzhcWueis2aRdB6dy7JrdAjA==|920 \ No newline at end of file +}//bx/S4NsiBrubZL7kHUHRUK1itl3CEYfti8/4r4vNJMpImxy/crXEK3FUHdtfRWBOkXAPCU83DHtU7Ulafs1LHm+fBRYn30Z0fQa04GAFSQz+2R5abQpJM49FItCGAxpQnftXujX5DgPAzdMS3mAu01P3HMRmXwZonA/9mKHjrG0RkPUrFv7//Ih8IZNcYIgkIE0gimZR+nO+Q4IXU10MauU9ku+48URqHnY7qlouvuA5e9moiJZ1hLca6A0fWbSYf0Vv7Ql+9GI1OohshOVioStrZxyYpqcsVMJTluCc9I0aoZecMa1qf6eDrt9mRtjfiMjQD+XCT9Cbm4xd+Zy6FCEh4qcmijftH3QI0q62tbNZxHfdXGv3ITFeUDsTZL4EqYnSp6pFY5u5jySK1LQ2mdSTxe0ARfRU7n2fn7KeMuhW7r2kaeljvpnATAwbtu9at5D1OlsLHI2zq/AFUyix+dQQOO/bal4ohE5jNLxYUlAY/i8gOddyzEzn+FXhfH100U/d20EunNrIvA2WsL9TZ+ZT+iHDK5N9mOCpqXruY9zjRCfGSFXm2PtSUtM0cLWXQgERWMdmOQqbcy97yDmoEj5EKX+lMETV8+qJFSfhHvFJ6nVcSvvlH+QoGnsJKK8O+8ZteaW/RoxYxd+/Y3vhIxQmjtD0p/XuH+bKIkqAhNEIHMVR+45op7qQTJR2qgjYkbenNP5f+eZo6gTsqYVU0/yM6CIh/n1FQhz4EzHG53Qcdgtlk999Vl6Qqs2cJ2JC3YWGCWIUv63SZ+VY2khQBO6wKhh0azBgU+NYlKeTKDV9PPCc5JBJphvs/4vGyFlkUJcGqM186u7hrT2ikIxIfy1jbwFIB9RLhbbfA238IUTl3lnUde2JFo9kJBtMnhT3Kn47fLNpwFKwnEowZ83bMA==|920 \ No newline at end of file diff --git a/Plugin/OPENAIFORGUNCY.zip b/Plugin/OPENAIFORGUNCY.zip index ce393266..5e6cc12c 100644 Binary files a/Plugin/OPENAIFORGUNCY.zip and b/Plugin/OPENAIFORGUNCY.zip differ diff --git a/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip index 16dee1d9..a5a1b7b9 100644 Binary files a/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip and b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip differ diff --git a/Plugin/对象与集合操作工具-8_0_0_0(1).zip b/Plugin/对象与集合操作工具-8_0_0_0.zip similarity index 56% rename from Plugin/对象与集合操作工具-8_0_0_0(1).zip rename to Plugin/对象与集合操作工具-8_0_0_0.zip index 0830d815..2274c9eb 100644 Binary files a/Plugin/对象与集合操作工具-8_0_0_0(1).zip and b/Plugin/对象与集合操作工具-8_0_0_0.zip differ diff --git a/ServerCommands/汇报/AI报工数据转日报.json b/ServerCommands/汇报/AI报工数据转日报.json index 7e01bd51..07617a95 100644 --- a/ServerCommands/汇报/AI报工数据转日报.json +++ b/ServerCommands/汇报/AI报工数据转日报.json @@ -231,7 +231,7 @@ } } ], - "ID": "e052560b-0e62-4c38-b37f-a36248865f2a" + "ID": "5a66cb4e-3cd9-4701-afa5-a1fd33b7e87f" }, { "CommandList": [ @@ -246,7 +246,7 @@ ] } ], - "ID": "ca83fecf-500e-4b64-aa47-2d44048c213b" + "ID": "10f38766-4f2a-4bc6-88bd-7eba3f9cfc5e" } ] } diff --git a/ServerCommands/汇报/AI生成周报.json b/ServerCommands/汇报/AI生成周报.json index d0bcc8d3..fef0822a 100644 --- a/ServerCommands/汇报/AI生成周报.json +++ b/ServerCommands/汇报/AI生成周报.json @@ -166,21 +166,21 @@ "TableName": "汇报子表", "BindingInfos": [ { - "GUID": "5a86d5e9-81a5-4702-9802-ee8703242820", + "GUID": "682e3991-ec1c-43c5-9554-5ca1a16084b2", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "汇报ID", - "GUID": "03bafd85-46b6-491f-8d80-cfaa6f064ea3", + "GUID": "40a0fee2-f429-4d1a-a23c-334e946704a3", "RelationBinding": { "RelatedTable": "汇报记录表", "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" + "DisplayColumn": "开始日期" } }, "ColumnName": "汇报日期" }, { - "GUID": "983acae3-afea-4289-97da-4e7e6a1b4115", + "GUID": "ac0c30d7-1062-44b7-a152-8a7c3ce83eae", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "关联任务", @@ -194,7 +194,7 @@ "ColumnName": "任务名称" }, { - "GUID": "4ef1c2f9-819e-44b6-838e-ee59bd614947", + "GUID": "5b78ad76-9399-45e1-84e6-0fa066fbb30e", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "汇报类型", @@ -203,7 +203,7 @@ "ColumnName": "汇报类型" }, { - "GUID": "75f5117f-96ea-401b-ac1c-f656d00274fe", + "GUID": "b2b05445-5639-4e16-abf3-fa277ade6657", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "汇报内容", @@ -212,7 +212,7 @@ "ColumnName": "汇报内容" }, { - "GUID": "b375e278-c5bc-4ba1-b97d-c8d1fefd61a3", + "GUID": "fc508ebd-4f56-4df1-9bd9-32348d08e832", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "工时", @@ -251,7 +251,7 @@ "RelationBinding": { "RelatedTable": "汇报记录表", "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" + "DisplayColumn": "开始日期" } }, "Value": { @@ -269,7 +269,7 @@ "RelationBinding": { "RelatedTable": "汇报记录表", "RelatedColumn": "ID", - "DisplayColumn": "汇报日期" + "DisplayColumn": "开始日期" } }, "Value": { @@ -301,7 +301,7 @@ ] } }, - "ID": "40a01e57ab3444eb9575e658664bbad5" + "ID": "26ba0870cc06470e8151078ddc367167" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -429,7 +429,7 @@ ] } ], - "ID": "baedadb0-110c-4a34-b052-e6a56d3a88f8" + "ID": "161f4f72-2088-479b-a889-8673d992de5d" }, { "CommandList": [ @@ -444,12 +444,12 @@ ] } ], - "ID": "6204ae10-fc70-44c3-840e-1aeeb2319f71" + "ID": "2c2faac1-4557-49dc-89a3-3a3a5ed3c33c" } ] } ], - "ID": "2732b294-ff80-424b-983e-bda06369d487" + "ID": "04edc70e-c135-4fbc-8f13-a8423b1b72e0" } ] } diff --git a/ServerCommands/汇报/新增或更新汇报.json b/ServerCommands/汇报/新增或更新汇报.json index aaa97951..1d7f5c33 100644 --- a/ServerCommands/汇报/新增或更新汇报.json +++ b/ServerCommands/汇报/新增或更新汇报.json @@ -121,7 +121,7 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "c5da8913-a852-4545-9915-d6c684a51acd" }, "Value": { @@ -163,7 +163,7 @@ { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "605c317b-6961-4b73-b0d8-79b9ea2f899c" }, "Value": { @@ -325,7 +325,7 @@ "Message": "新增汇报成功" } ], - "ID": "08348de2-a35e-4a1b-8308-59021ffe1f71" + "ID": "bb4e0e8e-15e9-42ef-98cb-08b268aa1f6b" }, { "CommandList": [ @@ -335,12 +335,12 @@ "Message": "当前日期已有汇报，请勿重复提交。" } ], - "ID": "1d857e4f-7f0d-47ab-ab83-082c36431cfb" + "ID": "84889dfe-a145-46f6-a69a-21bfb9d44320" } ] } ], - "ID": "28f0ee41-1467-4379-be90-af01e5350bbd" + "ID": "e3508c7f-b89b-471d-b598-e4e549efb070" }, { "CommandList": [ @@ -407,7 +407,7 @@ { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "汇报日期", + "ColumnName": "开始日期", "GUID": "b138985e-5591-405c-8395-f4388f10abb0" }, "Value": { @@ -724,7 +724,7 @@ "Message": "编辑汇报成功" } ], - "ID": "81c3df24-7e00-4db1-a860-2d0306f6376e" + "ID": "fd138a02-0e8e-4a56-973c-fcb1002108a5" }, { "CommandList": [ @@ -734,12 +734,12 @@ "Message": "汇报记录不存在，无法为你修改！" } ], - "ID": "f7772599-b8cc-4c58-afd7-82e51abdbe56" + "ID": "2429e8eb-7450-49b6-a176-e490c8834941" } ] } ], - "ID": "29957455-a71d-4135-a903-4f2b3d7874ed" + "ID": "8ec8be9c-89ea-4e42-9e54-db98037942b7" } ] } diff --git a/Tables/汇报/成员计划内容合并视图.json b/Tables/汇报/成员计划内容合并视图.json index 272886d3..a4b1da9a 100644 --- a/Tables/汇报/成员计划内容合并视图.json +++ b/Tables/汇报/成员计划内容合并视图.json @@ -61,10 +61,11 @@ ], "ExternalDatabaseInfo": { "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, "ConnectionId": "业务表", "SourceTableName": "成员计划内容合并视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH 记录 AS(\r\nSELECT\r\n[来源]='日报',\r\nCAST([汇报记录表].[汇报日期] AS date) AS [日期],\r\n[汇报记录表].[汇报人] AS [成员],\r\n[汇报内容] AS [内容],\r\n[工时] AS [工时],\r\n[关联项目] AS [项目ID],\r\n[关联任务] AS [任务ID]\r\nFROM [汇报子表]\r\nLEFT JOIN [汇报记录表] ON [汇报子表].[汇报ID] = [汇报记录表].ID\r\nWHERE [汇报子表].汇报类型='计划' AND [汇报内容] IS NOT NULL\r\nUNION ALL\r\nSELECT\r\n[来源]='报工',\r\nCAST([工时日期] AS date) AS 日期,\r\n[执行人] AS 成员,\r\n[执行内容] AS 内容,\r\n[工时] AS [工时],\r\n[项目ID] AS [项目ID],\r\n[任务ID] AS [任务ID]\r\nFROM [任务工时表]\r\nWHERE [执行内容] is not NULL AND [工时类型]='实际'\r\n)\r\n\r\nSELECT\r\n ROW_NUMBER() OVER (ORDER BY [来源]) AS [序号],\r\n[来源],\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\nSTRING_AGG([内容], CHAR(13)+CHAR(10)) WITHIN GROUP (ORDER BY [日期]) AS 内容,\r\nSUM(工时) AS 总工时\r\nFROM 记录\r\nGROUP BY\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\n[来源]", + "CreateViewSql": "WITH 记录 AS(\r\nSELECT\r\n[来源]='日报',\r\nCAST([汇报记录表].[开始日期] AS date) AS [日期],\r\n[汇报记录表].[汇报人] AS [成员],\r\n[汇报内容] AS [内容],\r\n[工时] AS [工时],\r\n[关联项目] AS [项目ID],\r\n[关联任务] AS [任务ID]\r\nFROM [汇报子表]\r\nLEFT JOIN [汇报记录表] ON [汇报子表].[汇报ID] = [汇报记录表].ID\r\nWHERE [汇报子表].汇报类型='计划' AND [汇报内容] IS NOT NULL\r\nUNION ALL\r\nSELECT\r\n[来源]='报工',\r\nCAST([工时日期] AS date) AS 日期,\r\n[执行人] AS 成员,\r\n[执行内容] AS 内容,\r\n[工时] AS [工时],\r\n[项目ID] AS [项目ID],\r\n[任务ID] AS [任务ID]\r\nFROM [任务工时表]\r\nWHERE [执行内容] is not NULL AND [工时类型]='实际'\r\n)\r\n\r\nSELECT\r\n ROW_NUMBER() OVER (ORDER BY [来源]) AS [序号],\r\n[来源],\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\nSTRING_AGG([内容], CHAR(13)+CHAR(10)) WITHIN GROUP (ORDER BY [日期]) AS 内容,\r\nSUM(工时) AS 总工时\r\nFROM 记录\r\nGROUP BY\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\n[来源]", "ViewInfo": { "ViewName": "成员计划内容合并视图", "IsUpdatable": true, diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index fd62209f..b1b3bb22 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -11,11 +11,25 @@ "Name": "ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "汇报类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "datetime", "MaxLength": -1, - "Name": "汇报日期", + "Name": "开始日期", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "截止日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, {