diff --git a/.collaboration b/.collaboration index 81e53845..5f0b6035 100644 --- a/.collaboration +++ b/.collaboration @@ -92,16 +92,7 @@ }, { "ModuleName": "TableView/子任务视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-11T15:08:53.1251441+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\子任务视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务评论表", @@ -679,19 +670,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-11T15:09:28.1683067+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", diff --git a/Pages/558ca610fafc4ffd8884b819161bfd6.json b/Pages/558ca610fafc4ffd8884b819161bfd6.json index 642ece84..d5fd9e45 100644 --- a/Pages/558ca610fafc4ffd8884b819161bfd6.json +++ b/Pages/558ca610fafc4ffd8884b819161bfd6.json @@ -92,7 +92,7 @@ "TemplateCellSource": "开始时间" }, "1,7": { - "TemplateCellSource": "执行者_全名" + "TemplateCellSource": "任务负责人_全名" }, "3,1": { "TemplateCellSource": "ID" @@ -153,4 +153,4 @@ "PaperSize": {}, "Margin": {} } -}//+0QBNFvh4NP9zRMRvqbvCQwG+++2K2mFJ8dKqFrl4nMtDrg87ktCDXqFb6Vw51r3pBNoYRpDDW3ClqtVkLQ6aEIA9f60gbrQnPhdWs4VaS3Be7iAOpH02KN/jG8J6XDjdOMkM/EhlryLNdBIUAvPRUY0LdJPcrR9aEJBsuYdWGCX7z5bUk5TDgwazIeUeMjI192EX70TFjL9XNK8rawA2Gdig8OM5VZdb5DmvezNcKnWn0Wq7KjdcmrwouPKym0WSzgq1xNzD69vNilOU6B+2fhE2pe42d+kfkRbryy5dSiCCWT2jiOtQZJwbHsOcmSe3BjDuBeaV+D+ngix+6IVcc/l7Sak/DQMUTYIw8gkGelq0Sr+4MQmpsN425ptDD0BuBk8/t5eS+SarD17+Ad3zoWFJy4hq/LxW+sbPKf6DDz3NIuFyTZRQ0LNCm+Ub0kKzD7MoqZkFA2SClXef3fOygel6KPt9R2A8gdlKYRPj7IZoeTYKAwHV8D5K4oUnoTblN4yyxmBdkjd3YKYOHq6h/9ZnjXtkI1gzmegh22wcNijoEwcnTsO3M2b36JPCASybi75Zj7Oa9Ooym/Z+6nw4LNZfnbF1bvgKr6yBKlVzzwbEOqLaHkZYk6p7MOf/KO5g64b+zp6A1ISRgXhh8Nv4nTAfUFHwcHNb5WqZUH4sHu7tIOu7OelrJnjxLBEJB3Ehnhpwd0QrJNe0hcVk8UvXRDAhsVw1YBtEJAt2oXX2rkJpxwFTV9q3+PxoUv1/LYntSczrCeoy7qibRXeazGclVdnNtIzbtB9PqGmQsdouP8+raXqQzcqUpmjHR39fANwOIcNk+G5AZkHX82s6P1KJlvvA3ov44INDiHVIc9GpoFQ98Wj6xkfrn+KtCWKd3X8+qT50Ic3AfJeqFBf/KQF/g==|920 \ No newline at end of file +}//7jPHse6PqSCs607C1XtNvryeBqZMxEhLDmUmVNDD/eq2rm5rt6uJf4f4PlKdIogDe0qoToFCBf0FmPOKtWOrioSe7gUt5/KadZ0sIZme9ecG9F5VrSyq6/HgOfS43EXh6BPcwuKni7lCdkhax7gxPnZXuv7L18ocBiuxi8tkaqZRmNu7FBjEYVCfQSMayGI2D08TDTQtnbk2GIVGOeHwnbXqWF2/CcmqRJ5hsY4PvOEGolAL7nJVM6ssdxW4GMjRGNp2I71wEl8WkaPLmNBUU1HINRH0MHHI2GTbJHOu99DBPvaMSbo4lbLuu+zPc+ORomOloIWcwkq1B428fs4Sw3BCMbixL5Z9o1mGMZa3vJpQeiLy6ATkYZ9jgE1I8QZYodbQw+fX0GVLbk3twjIJsK6PqqkT70OvwbpzhGbTv7axp3Sxx3tCLz/i/EnVvblxyIYTJUaEwpY84ubvhuXgWRP2DVSLhgBxg6YwtIN/BkYL40e4LDGpvX4XWt4g7I2le+HAqI+tYNsBCh+RpyBWXyhSzhyW4+xAWeD/mEhActtc+VqmNC8XSWUPBjLEuJ37lB/aQY4zZAUJuypWYl8cGySiEUjmuzSE32/rpSTarzgzs5ROGPyIPpDOC9B9hZH8h+wvw9RFIi+6Q/t9uJf1kPncpvtn040RAi+2hklWDr4D5Sz8SIsr4bZgVJ9oempCQVLQ5Jp3+HvrnmPmWFPtnNF+udGQLOMD5JslCzLrySYS+zYrbrzr69N7WUTagHEU8RPS4jYFYM49W51yM4TmpUfPG7qCf9/SM0RvK4eWScoR23wO6BYORksRqGV12JB8+GJ7/Xcbxgqg+HrlnMH3DXpzgY6oDbiKZIaS1VpQppi2tpJrco/+kSk7ZKWj+SJ0a8OdFbYewyjKKunroGUDTQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json index 7919d643..bcf8b66b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json @@ -261,14 +261,14 @@ "GUID": "1e19c53f-b096-431f-9fa5-fb5b4d539026", "BindingInfo": { "TableName": "子任务视图", - "ColumnName": "执行者", - "GUID": "ccc2f590-cc2a-405f-bc28-930c5907547b", + "ColumnName": "任务负责人", + "GUID": "93f57ee9-199c-4a6c-9781-58885037df66", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 } }, - "ColumnName": "执行者_全名" + "ColumnName": "任务负责人_全名" }, { "GUID": "2197d206-fcae-4d33-b5cd-9f0f82907951", @@ -348,7 +348,7 @@ ] } ], - "ID": "cd7f6033-bbee-4b44-b6e4-a1507e303e9b" + "ID": "7dfc54e8-8519-4699-b79a-7bfeb7197cb9" }, { "CommandList": [ @@ -365,7 +365,7 @@ ] } ], - "ID": "1bcbf1f5-800f-4898-a23e-1eee87e43973" + "ID": "37bc3cd1-ea7d-4530-82d4-0c05739a5e0e" } ] } @@ -580,4 +580,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//4G5FFc8VtEEEkLZbTkgajfIV29o/RiIMCVP0j8UTINxEvqX5/hONLfw8x4qtz7sgJP24H17YkStEYfvpVtHcUrMQAaDze5h33F9TpMUXqtW2fIV8hLRx2jQKqUfFCRAkja7YxL+8rC4LrM75rgZv8ejcQ8ju0K30Ts2FIQ/G8fWQxH8zJjaFRUzesrKhcMulN12hWiE+Vq+wCOZTatxPAgj9Ooz0OUpoNyebeTIkskX8iNrBnBXcEhQxlZPWMntF2HgoE+7ttU3uPCybJ+IHJ+JCrPWupn53ZjYuI9BjprAbiSFHgNdJNoEFyVPEp7oHm1AViRvyBbTBzyAqqkZugWGaE8m4RZrducdlrdlwx0dzayGxNQUwTgoLjrSeu5qKxKvK4lFQs8F5pV8qzLjMe0/mo9blsU6DesAFIG6pp/uu0Jl58WCPFKvguwlnGA9gBZbt/Ejvh1jkq4cJNW+rS4O0yswU7x0yXFq6/bn7H17M/6qrQQ6noh9ie2jFVIOF7FnZ/eeNFBiJnzPQeaJ2xJZVtOr8uxTx3yQR3MYaciuxzZOkrBR/63YC0U0lkvkX5wmlwN5zLI6W8BAQ0C86fajRo/ToShPJgV9g+iliYEhWfaCaAu3t8TstCgoeJza8K/08PvgrpKw5UxPTnoWX1dkMqVD6/2pOnhJeUEb01ibakUGBMSPpe+DU2QP1YVuBa5PwOFRERC+vVyuphZbFdVsD5gDojGeTroS8DU/b4VXrds3g5Ky+TURHkGBTsXaB1vngCpqKTScdxQMurFf39cSJv0x9LDklteStrTL0Xzi1U8hF6uA4h/eZnM1VnLuCl666/fBicKPyyHV/8ksxQl42jrR61jlR52QtsgZQxAbFkDHSW8H9oXfSR+9q0ZUOe7DC5aj4dxCvsf8x57u7lg==|920 \ No newline at end of file +}//uyAQrmWfm0HGOKWfKnW0TBUaDEGCku/L4j+2+i+6PHuOJm6lndNBiorxC+UBp9swmSJ1cXbEhJIJs5FGt2kTUZCfqAIF17UcvEi0Xj2Ty1DDgjRzaCHPAFH5r+zdr2HMYhSUkjhHhM39dwIw2eBUfVb4qRfgYK2hbOEhDI+vNr5QfU+eDQvSe959O7oK+G/eAMq9EFF6+9hUAp662avYPXAiqYg9ZpxEBmuaCJcya0IUmFjm1ieaWXND/Vos1AryHnfdUnB/U7lki5qijMv1cFIADglaAqNO46gxBhLxcMI78rTaftOSjr+TySFA5u6scZGhT8Hqb846KZ9w0nz+aMGwVf312Uuz2kGyI2idNX/5TzRUEj+RroeRHfp3k0mMgwCzb9X0PL5q62vumtDT9C7d7KgjUDZp55+JBlTJZ28EIcnVa4oCHjD7BMn/YsSk3WehWcUzNgPaTzOX/GbK6mxDzkk3qLu2NBb7nw1TLG1HmwI8l3TedFzle8Ko1oND5DEqIzfbteG8mO7RZX3Ka+Lx3WUK1Y6YtI1Q1xMiwRHLD2D6nxPu9JVciWrTsbDEOC+JJn5BewLlfUt02D/+fNckLCNdYaM1YHtjyijmbFFO3zYfKu7RbViacEWbuiw1K2O+0ErwBdXu6FXwhAB7svaXcxP3+OPYhAy13/0xS6Q8pLtqfdOeL4ZqG4AjuxTS8jjRoSfBHWAlMEygWqSKfTCbMzfly+br6cdL+lnmFD9IVWKpLFnLjr6jxmyi1XH4mRef+HPLAHODH3MGQjvZIcBfQRmLP1tGF9O67ELLLU3pffFcvuIL5eVDfxv3MQJKf5TjBLaZYVVcZ7fkAoGqD4UUmj0DRB7FynMX7pmgWz6j1OTXSC1Wi0ViAptFWyo1NeXQV+anUMIRPsiichBQDg==|920 \ No newline at end of file diff --git a/Tables/任务/子任务视图.json b/Tables/任务/子任务视图.json index fe3f9cd9..8df52bd4 100644 --- a/Tables/任务/子任务视图.json +++ b/Tables/任务/子任务视图.json @@ -28,7 +28,7 @@ "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "执行者", + "Name": "任务负责人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "HasChangeColumnType": true }, @@ -180,26 +180,19 @@ "Name": "进度", "ColumnType": "System.Double, 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": "nvarchar", "MaxLength": -1, "Name": "功能名称", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "收集反馈", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -207,14 +200,22 @@ "MaxLength": -1, "Name": "功能描述", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "流程实例ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, "ConnectionId": "业务表", "SourceTableName": "子任务视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT * FROM \"任务表\" WHERE \"父任务ID\" IS NOT NULL", + "CreateViewSql": "SELECT * FROM \"任务表\" WHERE \"父任务ID\" IS NOT NULL;", "ViewInfo": { "ViewName": "子任务视图", "IsUpdatable": true,