diff --git a/.collaboration b/.collaboration index 15281643..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -534,17 +534,7 @@ }, { "ModuleName": "PCPage/任务-反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:12:36.1804848+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -576,35 +566,11 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:05:58.6509912+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:05:19.8022496+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", @@ -2284,49 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:17:15.2978166+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index e577b16a..d64f46fb 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -221,7 +221,7 @@ } } ], - "ID": "a83d5c67-9f52-4d93-b7d5-4c9baaf9f1d7" + "ID": "a8138ed2-6ceb-4b6e-86a4-e55b7f7fd928" }, { "CommandList": [ @@ -236,12 +236,12 @@ "BtnText": "知道了" } ], - "ID": "1e061c7d-7df4-4577-9721-1a61ef15b49f" + "ID": "3b0aa095-aeeb-45af-bed2-6234dea3a0da" } ] } ], - "ID": "246b064b-a24a-4efa-90b9-b81a5eacec78" + "ID": "fefabc20-434f-42d1-914e-e39923bf6d53" } ] } @@ -367,7 +367,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "0dd4c521-e1aa-4a47-beb2-6c16a714bda4" + "ID": "99410361-e444-4f4f-afc6-109b4cf378cf" }, { "Condition": { @@ -421,17 +421,17 @@ } } ], - "ID": "5d82753c-a57a-4fb4-b617-5ea61b6b1fe7" + "ID": "73529d08-5885-4776-b362-d46d83e34292" } ] } ], - "ID": "e6a40375-d86b-4ef6-80f3-db02cba121b0" + "ID": "96f21ba2-7bbc-442f-80f1-62e6da8e3c8d" } ] } ], - "ID": "c0a4f7c1-34f3-4906-b948-be5b62f8f951" + "ID": "86a5d7ae-a937-478d-9a5c-3895c0c07cf0" } ] } @@ -570,4 +570,4 @@ "PaperSize": {}, "Margin": {} } -}//Y8OetJSRZcDPcpZE5mtrPWo0AA+U6dTpA3/VdPJbjhsqIki3r3sTPiKe3faKTpZ3W8r2G5uMzxtdvr25ZJc/ljyO5Kr7Hz57N6Y4ic86cmtvBYIEUNACdzca6GKFtvWG0Vzd5vSntzipdK1/xia1z1j1mVTLPdkXR4NJWBc03O4v4HECB6sBUXprFCWKD3/2XZfRae5+gCFUtOd/C5CDLLhE6PsEN0VbmEO8mTeY0cou/YMtGm8aH5GI+UI4vgJpeUcbeHX0SLAxZkkSxy7bjnNyBDEqFP8nwG4KRB0OyR/kHhWFNmMfoXZp8T4lCb002M8VWwBu9EpIJ7YithKtaLv7FWv/mkX2HKLTDkPdhp+akkH5qP6w8NITNj8MKFuiD4dd6KSsyFpG4FXAOCh4hNVmtvrsULK7bq4HaBpQAM/cE8ftIshiv2qHh2yFiJDn7XI7NfIAliUHcS/2QmhYzpTIHPfRdeCRWJiOYnoDI7AMxMx4qDo1k3P+hjjqt4ijDeCbZ1twAjItesiLZdA+slebAChlzHlIFbIbwofKUPiJDm+wDXwdRrMkVxizKzHK3O7jx+VqcvCHsUuLLUA2mbA2P+HVk/HoEySmKS7KwHV2zjbEO+CZMFqVTuNzei0TztM8wNs2sfNGIVj+KUk1WR/kv31LV2HryNJMzPwsczUAMoMCOz49RcxISbUOFmXTXMolKWUsPJLYL+lZ5bjohKpz0bJEdsq1NstJ2MCrch2QuclgwxddNg12JJkOH7mWRZ8VSudYnmBuNM7tUPmKlyZGJdwfezilhA9Ntxw0yMjL4DUgoZGiw5bxfS5GWuSsiEWgze8p8642zDDHXe9DnKuBYR8JOLH9fvR14+YOvbQwmzRuRl+5GRvLZRUDKCBoYAj7/2q7v7yHJbHfKgz/Bw==|920 \ No newline at end of file +}//pWj2+gWQ2bLc/ys0b9d80GOlV25s7FnGDMbKUU3/C0LSBHkINrV5QpZ3XKKxQF80p7tTHh6Yv+X8Y/2fqZzmzNWro46bP246bDVcEgP3czDvlHejH7uocXDM+9n4TZXkEJL+Nv5iMre1CCrY2mcXG5qX8w7zJMRVVOxQMCdKAQT1unmFDwuNLaYASh/TO9TPmwl3uJkgKqmx9LrlV4BsCAXrThnl+jArGFbIbPVhQCXMVj99h35vlMZwqg7dl2M20iwOMeQvLcwL5NkKsjNTM0XvajZhComcOADES9l+Z5Wfa+n3xYuvO9pXavaThN7Iv0Qjvq9MtPB6G81c+2sYzF3acyvBPpeWgOj3Is0AweGRAUKc9ljtMNTHJiu91bVOJeaX+432JmN12Y4nV4ngnY0bfKlFbuLtpXeolyODujZTx0utv60iCEeXwMW6U/mPZLCkwrKY5iG07xJm5O5YtYXtibFb4u+WelOEF9T7zgWS9xg0ISoNmYe7poxLX4e6UaZ6sIk0mee0796qexuNtCuJteCmIxiEDSIKF/h2dvOKNaJjbcy4oL0ifDmQh/dhtg1SgH7P3cgmgFvm6HXqXELwmpqP7jEyv3NTNIZTDMmgHZnGfKOxDEpnoL8dJ1RU9a5o9MBdqp5svkCIM1AQ/E+9Lfk5RnNSP0/19MoPUhLOd+XxEm3RwAcL0N7oq5Mmn/6CzkzsAyJD7dH8Pi+dwWqjqmlD3XzJYXhGvjF0O0fqYij/Id8ROp9M8PEnBgnbdSVkmSTi1eRXDsrL9lB8ZTZ5x1p7Ecz3SL1t1vMsnoPfeJYfAfEMIEgjnn/Z6ODmmdaYuRqiM6ZSfjdtH7LKf9d36k+qUOanMwgarjPZ2zRq8thB2O5MFgBiQzZ5PWXCQBudf5L0manWMI/WmFmdqg==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 6fd77d3c..0e9d28c2 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -141,7 +141,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "55c08d66-c7f2-400b-8578-a3bff6cdbe90" + "ID": "1656ff77-abfa-45ce-86a4-899bf5fce72b" }, { "CommandList": [ @@ -170,7 +170,7 @@ "ConfirmText": "您确定要删除吗?" } ], - "ID": "64a06e13-5b03-4a37-94d2-6d2270fc7340" + "ID": "dbe35d8c-8a93-4dc2-98a3-574f051eb134" }, { "CommandList": [ @@ -180,17 +180,17 @@ "Message": "该报工已请款,无法删除" } ], - "ID": "a8fce1dc-88c4-4273-963b-8c9d30bdc3fb" + "ID": "b48a77d0-72af-4278-9b9f-9dd32b1a1cd0" } ] } ], - "ID": "6e8fa6fa-7f78-48b8-b42b-fa1344525fbb" + "ID": "ba303490-bc81-4396-935a-02f30ff06f26" } ] } ], - "ID": "bfd16da7-a3e1-4fc7-b2c3-3bc35dc9c808" + "ID": "c305bad7-e5a8-4298-9e05-8aab7287da74" } ] } @@ -258,4 +258,4 @@ "PaperSize": {}, "Margin": {} } -}//7f5ZWsRF1jIdiI61VD8kvwYgf9Q4BLOx+/OJBgLv6WQVvD+waHC31ci33y54SmGspHIZ/2pIh2trsXB9vbcMJ11b1BSWiMIcFSjkiSx7A7J+DN/VW8Pcmc/KkF0lxwrFK02evizH0blmapQkY5gc/gxicN6B6E0ocOEpOSsvkg/iZKXSQyoRbBZza/4/EJJFIJ/H9PoDmCfmM7z+p0EQqD5sX9vsORfeMMmi9BYMafXg+lVRp6Cxis3N5Z2ARKFojoAe/v4bmqukDDpqwp1B9ygypacUoKxEnOoEYxsrgXu8WN4PhEWwsKOK9Tl6uU5SX0aJI46naZYgT+Xy9YPsWOGxenFgFR2IbzqtJdYM7yuqCLFw1qoFXb2m93GrhwrAkHyctQ+31puL3cVDVmTVtUzav0BuPpk1mo8P3kSkUFz7TEe1ECjPmieoPwSBp+IFeZi71pvvq7mtHrZ2dmwJFISTuhdaRv1zmPXJEGTUaapNIpVzDE6kQAmFyUCPtFoVuM028U0d05XXUagym0tR7/aTRAoupxZoTmkSUXvOStt1GzlfM47UN8Q1BT8xqwsPyW+FluqlSGDRVytMIDxxyejyvaL6b0JHq69EVloRhiZOYadspyw0KKiCF+CXc7V89U5SnBbez6lDEIYOq8T8/Lpl5GtBCZtYTjACWfZGgGRNxLuu9G90YonnlIOuxa94Ttc4b0Z+1SFs9oLWW4YCzu24piFDEpJFw46yYAz3wIQ0DP5eoL/fKtfipgB0nGPMzyfy1hIKeYQv324eC1Av6GwCpmpDbztSEi69bWsIrW86CzfaNsWw1QbjYtMm2rrjjxb3gA3VsEPEWs3k+hYq/ln/ADPYvkzSDXTKuSY+Z/0UJI7qrDonUVrcIXSr+LJyPE2yu6la5RJxgHDrzGTiZg==|920 \ No newline at end of file +}//M2rITRIw5YCk7wtBDCHXs+A2pf3A4OD36+HgjEQZJst34tkVmaxY+DIlNUwP9ec0yHsFt1KYHkvs/PChAhr35c4q3vsIg6G3+n9XmPnNqQp4Hns6RUecmDlfpRMzXpEo2YPjrzryW4gdndFBOUyUXwo7pm45M9X1VmlAPvokJa7MKb5onDJEUUo8HTdRjE5YkC2m8t+iXcWUj/uR15umcxOHjzLGp7kkCaI4PjuKqbN2luDGpxnZJt9KoWXTwSWpvNIfHQj0yl8adTR2oEV4xkCfj2gkQX3gVDzAfO9DgbodY46EI7W/MX2YiBrWX5pErl0UMMOQDGkyII6ueBy7zoTerGbL/0yKIdmX/uC+iXrc1/VwopAC4RPWBuY9erbG7yJ/38RxH6729BuuL/U6sWap1T9kcKsxymaHDHR8NRtihVXmqa8/2X+ZtAuSuIv1GYvaW8nWEaV51Oaz+gsyF+tbDFnAZIQN9MmWjQ731KPS73f5pEj6+oQbxkl8YEjd+CID6VaM0JnXOptoteLbNLm+mPr6/mv8LsRh4wx4ZRxEEXle58FP4+bCAXPyrpZl2c4UWGlTa9ZnFVAJiJwgv/PrghNb/mCHOEvCSmMsdoX6b/JQqbs7yI8hS6oDVZTREpYQsJWKX+kdsIm1PPbhUq/jl38/IKq2kC/yUQ/BxR3fOCqaxaqPkZYph6Ma/MXBY8JWe5+paRrIyUJggM9OHh7i+X9EahKjDrIvE2V7/ga0fFFgrFrkm4BFmT2FOPoRFR7eFjGZzIwRgrR77X5uFYx55DS85EN3Erd7jhItic6Jm4IuDn9ZEnaEoq9oOb8bgPKN9ck64zGugAGPq8YqCE53h1Qgj8KI7TW/Vi1OLo1j6D/twuotnis8gvzTb23f/dxek8n7vAmXAVKyOssK+Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json index 05a4c0ca..55f5b9de 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-反馈.json @@ -288,7 +288,7 @@ ] } ], - "ID": "d534f398-1c88-44a9-b207-02014b99be2f" + "ID": "e6082774-dc25-41b1-a20c-7968c53719ed" }, { "CommandList": [ @@ -326,12 +326,12 @@ "MethodName": "Focus" } ], - "ID": "3aa8064f-bbed-4d75-b4eb-80ac543a4bd4" + "ID": "08198ec3-531f-494b-9e7e-77033a574b36" } ] } ], - "ID": "6639b507-88a4-4eca-9fed-f9ff645d8b04" + "ID": "3d06524a-c449-4cd8-9612-929c24033971" } ] } @@ -457,7 +457,7 @@ ] } ], - "ID": "6e3665c0-0e65-44be-8c0b-59b25d316ebf" + "ID": "0ab66424-e8e2-4a6a-a36f-e4ee80836d69" }, { "Condition": { @@ -479,12 +479,12 @@ "Message": "清空功能名称,请先关闭收集反馈" } ], - "ID": "1f84433f-7bbe-4e3e-b903-b0fc0a80f2c2" + "ID": "bfdc627c-f1af-466b-95e0-75ed9fdbadeb" } ] } ], - "ID": "6a31175c-a0b4-4878-bc54-e8bb631c50c6" + "ID": "c094220c-003e-4742-a7db-49a2f66b9b2f" } ] } @@ -580,7 +580,7 @@ ] } ], - "ID": "b32a0409-4025-49e1-aacd-73ed5c849523" + "ID": "84760840-205e-409e-bab1-8e0cc95f55d3" } ] } @@ -623,139 +623,6 @@ "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "需求反馈登记表", - "BindingInfos": [ - { - "GUID": "dae6f41a-c126-49af-ad54-6dedb47d0a4c", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "ID", - "GUID": "bfa40a76-1974-493f-abd7-eb64a793493e" - }, - "ColumnName": "ID" - }, - { - "GUID": "156b2fe3-d8c5-446c-857a-b6102f369287", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "工单编号", - "GUID": "883b8fc5-9dfd-4107-a67d-06d52186fb17" - }, - "ColumnName": "工单编号" - }, - { - "GUID": "43ada8c5-9b85-4372-b023-f7bb50dffe56", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "反馈类型", - "GUID": "0f1d3596-295b-4c98-91f2-dc12abae4060", - "RelationBinding": { - "RelatedTable": "反馈类型表", - "RelatedColumn": "ID", - "DisplayColumn": "反馈类型" - } - }, - "ColumnName": "反馈类型" - }, - { - "GUID": "cb5aa70a-ba7a-45b5-adbb-e0d8442960f6", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "标题", - "GUID": "2e4ea8c1-b192-4cfa-89ca-d82a43223c68" - }, - "ColumnName": "标题" - }, - { - "GUID": "971f7f0f-dfea-4759-9228-6209c2abe06c", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "提交人", - "GUID": "fdcbd160-17b7-4533-a2ae-628b42e12302" - }, - "ColumnName": "提交人" - }, - { - "GUID": "e475dec7-e83a-46e0-aeb9-262190dcac3e", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "处理人", - "GUID": "95d0f6f7-2c46-444c-ba90-148296cedbc9" - }, - "ColumnName": "处理人" - }, - { - "GUID": "9818b893-2439-4680-9587-9c28a5990825", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "开始处理时间", - "GUID": "ba9e4ff8-45b1-4036-b4ab-eeec8d95115d" - }, - "ColumnName": "开始处理时间" - }, - { - "GUID": "4cbdf932-b7f8-48a7-9782-eb024f4bae8c", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "结束处理时间", - "GUID": "5713063d-8099-4b5a-815d-ea5dd7dfbced" - }, - "ColumnName": "结束处理时间" - }, - { - "GUID": "f84d6bca-406a-4feb-87c2-6db628b8950a", - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "状态", - "GUID": "15784b6a-837b-4bb6-9c52-611316f1ca91", - "RelationBinding": { - "RelatedTable": "反馈状态表", - "RelatedColumn": "状态码", - "DisplayColumn": "状态" - } - }, - "ColumnName": "状态" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "关联任务", - "GUID": "0ea16ab5-e5ac-4f40-94ca-e44a449c894f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-反馈'!任务ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "开始处理时间", - "GUID": "86ff29ec-277f-4847-9bbd-02b37afe5415" - }, - "Order": 0 - }, - { - "ColumnBindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "FGC_CreateDate", - "GUID": "09bb23a6-891c-4f48-ab07-78d2871bb9cf" - }, - "Order": 0 - } - ] - }, - "CacheSetting": { - "AllowCache": true - }, - "CustomColumns": [] - }, "autoGenerateColumnsByDataSource": false, "columns": [ { @@ -888,50 +755,6 @@ } ] }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "开始处理时间", - "label": "开始时间", - "formatStr": "yyyy/MM/dd", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "590dd501-012f-4317-b593-5f68c3ad8f87", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "结束处理时间", - "label": "结束时间", - "formatStr": "yyyy/MM/dd", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "812fd701-19f7-4559-af3a-3ca259cef384", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "状态", @@ -1069,6 +892,182 @@ } } ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-反馈'!折叠任务反馈" + } + ] + }, + "value": "1", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!C8" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "反馈列表", + "TableValue": { + "TableName": "需求反馈登记表", + "BindingInfos": [ + { + "GUID": "1a639428-6631-4fec-bf0c-bb5ac89ce71a", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "e9bd04f2-61b3-4665-b677-263ec0f3b777" + }, + "ColumnName": "ID" + }, + { + "GUID": "1ca986e5-182a-4cce-b8b1-6e22f8e287b7", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "反馈类型", + "GUID": "11c3b4ed-8b4e-4266-b479-2debf47e0bd2", + "RelationBinding": { + "RelatedTable": "反馈类型表", + "RelatedColumn": "ID", + "DisplayColumn": "反馈类型" + } + }, + "ColumnName": "反馈类型" + }, + { + "GUID": "d5983765-c9e8-487f-85b9-eb276dd709e8", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "工单编号", + "GUID": "c8302570-f863-46bf-9dc7-06f130256c32" + }, + "ColumnName": "工单编号" + }, + { + "GUID": "c1eb74ea-d85f-4af7-9460-c81c440c1be1", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "标题", + "GUID": "5d9d52ac-e6bc-4752-948a-7d3378204027" + }, + "ColumnName": "标题" + }, + { + "GUID": "76490aaa-f66a-4a3e-a0d3-595ac26df180", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "提交人", + "GUID": "2b460591-dd41-4283-b87b-c500f21d3493" + }, + "ColumnName": "提交人" + }, + { + "GUID": "02f84b04-fe3a-4d03-8b03-2e98424435ad", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "处理人", + "GUID": "7bed9142-4aaf-450e-9a04-e83a32276238", + "RelationBinding": { + "RelatedTable": "用户信息视图", + "RelatedColumn": "用户名", + "DisplayColumn": "全名" + } + }, + "ColumnName": "处理人" + }, + { + "GUID": "2bd0c3d8-8f32-458c-8fcf-8f7343c75406", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "状态", + "GUID": "51c750c4-5084-47be-b482-00a8f857a9a7", + "RelationBinding": { + "RelatedTable": "反馈状态表", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + }, + "ColumnName": "状态" + }, + { + "GUID": "8d953087-6e94-421b-9625-4787f6ae753d", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "FGC_CreateDate", + "GUID": "3e1f42b7-4070-4a8e-a1ce-ab6a46f984b1" + }, + "ColumnName": "创建日期" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "关联任务", + "GUID": "c8be54f1-85ba-47bb-92f5-95f686ec23c5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!任务ID" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "FGC_CreateDate", + "GUID": "5098ebb7-4eac-4906-ba4a-b7f74148e394" + }, + "Order": 1 + } + ] + } + }, + "ID": "5ed72cda343d47ec832ffba63efdcbcb" + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!C8" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetJsonDataSource", + "ParameterValues": { + "dataSource": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!反馈列表" + } + } + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-反馈'!C8" + }, + "Title": "加载中" + } + ], + "ID": "eece1de2-f50b-4e96-9a0c-6e977090c728" + } + ] } ] } @@ -1301,4 +1300,4 @@ "Formula": "'任务-反馈'!$S$11" } ] -}//FWvgJ35pjbI7hJNxBTY8KbqqSBvBsnehom/bbZlfkJom9fktrI2shcV2EoyuMLInJV/ghuSsPL2UZJOv+Wg4p/Qe9JraPgMxpQHdnSDAWRmEcp3Uy6KcJOVTcRtEk20mCrZfR8+8Tnt8XIaIZGqwhS/AAFh0waX6dukqOEEQIUOCWSqbCFG9c8YMx4XzUD+VcdCG8kLJr5EPid4v/uSFOXDTB5tfT5Q3gUBqYvM/kk1KeON1apj4UG5Fja0iV2296LPgD/FDOX8ifgGK5dJ2XgzKZkNYjQs133HwSz2+RSlOVLfP3pzL3fTup4CmtqXKU7yx2Dv/PKKpNar1nT+IjquURD/UJVunRpjHkWuCNoH/Cu3FIW9Fn5sLt34zrhjy3QgAOd2/h47bg1qelaGsnOQ38o6n+5U8bPOJ/kb9JJhtIEIt6vsbgLcnuku85wFCkGQiqfTkVgjWrbAZORrRZmA+VEJVpFsyr0arN0MUQbmGXYGgBaYo25FunsN/0cvkQGNw3T1Zq0RR17NxFLRhr5Y4oBMQHIg8r+5uMKYmWqCp67Zwm83AsaZ4OesDSL3Vhd8t/QWqeTCAG6BK1p9I8cNGG6K72KrFLRI+ES3jYsRW9HnZQIWcVNxmfXBQiu9/5oOgSIUPY3h0RsqRFVwpj11s432En1sQA/4Sf5BadNeqht9McwFcTJeis8yPBipCKidmlyZKLkFvuzXXokHU8Rwm8Tm1uR17/kMm7holRt9/mX//lxNlpuIhHHqOmzaYOxrzr+vnFPqPV4zq1gUaVx+Yvrkl+tE5u4y4KnfWhW5BHGrHQy0iNXF/t1uMusLCQfVX+i8VB9m8uwz/GM9ia5I/vbiDwUPsXeCyfQTEus/qek4IDUW6Tp39mVg6XYXbSLaIsCZmZvaLomYRxGmUWA==|920 \ No newline at end of file +}//gKbVgWXIFjBi73dnquTg8A5kgFdirGRbeyoKbXjm6blzVswaemTcOzCey890i4ql/Dty1aMLfGVIv322hbtU1iylFKUFusEQkIk+ojCA4Koz2dvBNDifGM3N08PqS/fdqnMlzTJyjiDvYYKEVJuH9UtgflUJoETsP04Ze3xTaBqAsy0+wXfGmIF0CNRSEpCuCn63poPS+Y686S3w2GDgrlnM9fe+q6uM3vljnIzluwmd4sJb0aFhBVidFTeVFGU+QJGopw0MeQnxAIEBz1z7YsETyTu5/5uN27NoPwm/XPVMk03qfyC3C0N1s5CkbZP8q2EvD5AG4aHifmLHwrrQ02KjNToT+UF8UnNo6thwaYlXnyr0EuOxHasztYlcVX6L78gIU/hWnZMcPVhHZezfFdqrTJuEEJZ4azPwMIGzPEA+HZHwEgZL1p2LrbRnua0VeXqeklHG2XQJcXCGWimbdqb/l6eDeLEgjun3t0h/8D9h3gSu3aqYPHfS2Qbev93ZLZ2raKo024nIYPP/7vBGmd1W2SPktOkOwmDjF3Hi9ynRl+FSDKDZEFSFfY+7KetmmEQerdyWgGaaovZ/YOopupehpESUQcT9sKJoeD3kusRZFwY2fPcPHaPguALEX3VSn9ajnUnBtKPGa8rOboHb6WJ0y2a/07fXM4fIvX7JFqNbOqNO2m7W5mE73ipN6y73/NTUd7Y/anKtpxXY71Vq/a2JJaw1FxDJnVT6fc2XK0A6b0ehCPS4B34BUXZdonKPr3dw2WreU6sDk+nAoXZAgKQnVM5NAtKSa6QWCXJ0FXLH05nijPUwPOTsxhvaDfOUJG803czYJEAHSIcri+EMQIBu7r7g1yv89ruALXirZjPzVvfCF4DExFQFXEVl5cqoLPObeDTJ4QKJXYT4rkY9PQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index 50b9e8c4..16ba9989 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -331,7 +331,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7bd2c94a-e476-43c1-b7e8-b25991a68266" + "ID": "88b409f6-8a88-4716-8c02-e96c48153440" }, { "CommandList": [ @@ -370,12 +370,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "d39a87bb-a89f-4278-9250-1ec4808d050a" + "ID": "d6867e30-a389-4713-883b-861312022030" } ] } ], - "ID": "e02cf14a-a179-4abe-a68e-c9e67b6b5caa" + "ID": "876199da-7dbe-4309-a9c8-6fedfe63bf33" } ] } @@ -430,7 +430,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "70fab56d-b49f-4f33-a0b0-df5189a0e243" + "ID": "8129a099-0289-4461-af82-0de48fd1aba1" }, { "CommandList": [ @@ -440,12 +440,12 @@ "Message": "你尚未成为该任务参与人,不能报工" } ], - "ID": "ab68bc97-1efa-48ea-af26-24591d2d2708" + "ID": "f45e3c29-34a2-4c10-b0cc-3f3064b9bd03" } ] } ], - "ID": "4fcda8fc-fc38-4c4b-9cdc-00624004d63d" + "ID": "44a7e011-f8e2-4856-892a-7e565c3a93a6" }, { "CommandList": [ @@ -484,12 +484,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "ada720eb-6cae-44b1-9b1c-8b2a3a3a706a" + "ID": "f88e809e-1738-49bc-a8de-39f4dd4f3dca" } ] } ], - "ID": "537652bb-7b0c-421e-96e1-a8e02ae14e5f" + "ID": "fbe3a622-5b98-4f26-b389-5b66d387d509" } ] } @@ -542,7 +542,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "62267677-435b-4e9e-90e9-fbed9b64f406" + "ID": "09e5753c-db1d-4aef-acb5-8f3e572007da" }, { "CommandList": [ @@ -581,12 +581,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "d44416f3-74d3-49dc-afab-10599d61b986" + "ID": "6a906a8a-efec-429e-8121-e1b1154877ad" } ] } ], - "ID": "ba06c5cd-9c08-451a-9a52-77be32728918" + "ID": "3040d6ff-dee4-4295-9dbe-5996bc46a64e" } ] } @@ -666,7 +666,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "681c9a9f-d6da-4c6a-a15c-447cbb6d5709" + "ID": "224d48a7-b923-44dd-ab35-216ace292965" }, { "CommandList": [ @@ -676,12 +676,12 @@ "Message": "你尚未成为该任务参与人,不能报工!" } ], - "ID": "40db06b6-8015-4ebd-a834-317722782df7" + "ID": "e3848fdb-acda-4400-ad4a-6137db428186" } ] } ], - "ID": "388000a3-9539-4520-8658-2373fd14acd5" + "ID": "08dd25e0-eb7b-4780-898b-fddba17c5b76" }, { "CommandList": [ @@ -720,17 +720,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "3ad31ea8-eb9d-45ff-93a5-782061edab17" + "ID": "7795f6e5-d4af-4091-82ff-9d08dc0320c6" } ] } ], - "ID": "93f2ae31-57bc-4d0f-87d2-cd3494f0e1a3" + "ID": "6834f18f-56ae-4987-93f4-40235b2c9a07" } ] } ], - "ID": "7903f9b8-d8f4-4cfe-84b4-1905b071231c" + "ID": "1c91955a-a35e-45c2-b898-f6873a2f4970" }, { "CommandList": [ @@ -740,7 +740,7 @@ "Message": "当前任务状态,允许上报工时" } ], - "ID": "eef09514-36b6-4422-9293-3d891ea98aaf" + "ID": "0d714e45-8985-4a18-839e-5bfd74036b21" } ] } @@ -902,7 +902,8 @@ }, "DataSourceListviewName": "图文列表表格1", "LoadOnDemandCount": 10, - "TemplateKey": "竖排无样式" + "TemplateKey": "竖排无样式", + "DoNotLoadDataWhenLoadPage": true } }, "10,2": { @@ -984,7 +985,7 @@ ] } ], - "ID": "e1e5fd89-d1d3-4aa1-89b5-77cff83d755f" + "ID": "b26b9be1-94d3-47b8-b582-a9281e2296d7" }, { "CommandList": [ @@ -1004,7 +1005,43 @@ ] } ], - "ID": "643c2037-2c9d-4aa3-a450-40faf57e6487" + "ID": "c9f601a9-35a4-4cd8-ac63-299fec552be3" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-工时'!折叠工时详情" + } + ] + }, + "value": "1", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": true, + "clearRuntimeQueryConditions": true + } + } + } + ], + "ID": "96c3ccdc-2018-4582-9b39-6690f2daa96e" } ] } @@ -1375,4 +1412,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//rnnwY0bZFBcqGQjXGi/8NW8BZ9MaxILWyb5tkmyoy3iTpzzJI59DCHOJ6K3WMVxdoVIcmVshGeGV/mjkzzQnSwE3gHibDjCWzj4bH4QsdvD8s9J6B7tcJB1ZNUKAaPhGS42udJ00B3BW3PgwTn4be8eMwXSEKmHaeJ+3ByP8vJa0zFV38MJ5SAOwtbyqAFyQae4otuy6/Nevlc9xkVR/sZM+0BYI5UVHuF5g7F+O6iLIqxjVb/azqxHf1WTAzg3zzJ75iaE3VUu1cTL+bQdBj1HGvH5c9OA8IYIBs70lLWCB1qa8v6VQ2/SPk2zkk6x/yu2Yj2wcJMq09+yTf3lhYRUy61LCkzVSjnr5b3gI2hLwtLLpHnuJxXRlT1drRCwSk2nHcLdz05jiLPVWY1oiQ7ufBCscG7cPj0gTOgMw36IQxDve827zCKJ3FNxh5xdJ9afZs8+/fspqq1qgF5rKrdxYv2VvsLoIHHH/dxEZ4h1uHwIcmjOAJxm1jRR1L1u1HtAYnvl876K3jfdxFuA4QsVE7wGYTxFelv1P59H9/c+x82XAuQVxoLuz0npY0N6GLeoE9dA2eO+MtSo3wZErdT7IeV6Dz4NxJxFdNc03yvl4J17lyxQCeoOMROFYDPHcP5X7dePmLYpthOrbuBlHvGFjLSboIue24epyKshXs9++e3cHNISJAyFMVrwxfCmDad5tBVRkp6b0OuvN60C0g2scH9DkjDVAKVKjiTqChPQ4I3FF+Iv/q1P6053zdWbpzmMM3eppH5PQH33ApOPBp8dAqUfVh0azsCHoVCAL8LtonQEPsHTtb1Zd8DVL8NTlQGaUnL9krbQYF1VzXQeHllqkKaqw/Sc21UEBY9mr2AAWTMfcip8q/B40SOBHrk1WMDddlwGIjXBdEh8YGyne6w==|920 \ No newline at end of file +}//Xvgjtqg/t2/yf66eP8o1v/8HncY1KM0XYtqZrKuBnZwmCJoVVSmWyfn28w9CYJHmv65neXs5NmRRIpLtnW0rGzLIF8vQ7LEic7PZeS9oL9qzup8kMLIa2jwdOECvoJhPoPGefu8T2XzGBET0eQdLFdrMG5aaed2Rfh0xbhVW3uIS8tBKYUxvgwsO0MDh8O9W15okx2tprDEv3vzYRb7p9kUNzVH8+6oforv0fFdCG/cwOvnVbiQbWsMwcabbQDRQSJ+nfOXkXOROHJ0WoIbOjmP6wa0Ojl5QX0UPtVuoevPcCQSNobWgT2y2l8RxyG0QThmDt5vsFVXZnEIOXyZ1Is2KQygMkbY8CkD2cVwIseXqVsZNSvQ1OZW5CWlTZK8LapLfOwoN4xgbHU//x0Uh5c9f3fCkvKNAhwpgx5o2CxPO28vU3t6Yo0VUugKC/bAcyHYP2YNUV3L+RXcnyATsShBdZftxvtgbdHrLEKpLpVsmW1bXm9o926icgskZoe6r98q3BoXBEy7rynrndC7PV9lfkwb95leCRrvENpJ9yIrydBN5exoZTsr/jIPSDx/sSXBKZ64y+QS7+XAvd4Cdekb7T8VLxBuaBigrcbx//ErNDYbFzkS4Hee3VuM7euGq8KXZxbyGuAn8R50gSuM5mX+jVTXNhzk46i7PexkhEPkOZvHtCTg2i3bcLvd0vhNrMGgUpO/TVVi1A1JxEhC8+vvfc1DDsX6WdIGO0O1Mm7TgV0JwimJ5Q7AkyocYCCjVkiV+t6PmlGTlbFbQzPBGGPp96Bt4CKH0IQzOUHSTCtNKNGR4elFZ5uRbIZmpAuRibGGzi7yUmakcjAJ9L0w0zBhhnzoIrK5DZgg1wqtBY0JshxA1roBxww2a9AdHclGHp0qTDMkQURbzW1ILB8mheg==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index b9a72bb7..8a867e21 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ