diff --git a/.collaboration b/.collaboration index 5af01cc6..cfa22bae 100644 --- a/.collaboration +++ b/.collaboration @@ -237,16 +237,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-19T10:04:54.8824454+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/反馈状态表", @@ -599,17 +590,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-19T09:50:19.5801604+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本管理", @@ -1936,17 +1917,7 @@ }, { "ModuleName": "PCPage/页面反馈录入", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-19T10:01:50.3191807+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\页面反馈录入.json", - "Pages\\项目\\项目反馈\\页面反馈录入.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/发起任务流程", diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json index 5567efb5..0e5dce09 100644 --- a/Pages/项目/项目反馈/页面反馈录入.json +++ b/Pages/项目/项目反馈/页面反馈录入.json @@ -1089,7 +1089,7 @@ ] } ], - "ID": "8258a346-a753-4c8d-a271-03bdadc198fc" + "ID": "919d8e9c-a664-4449-b94c-9407c773350c" }, { "CommandList": [ @@ -1099,7 +1099,7 @@ "ShowConfirm": false } ], - "ID": "6c25b51c-919b-4536-a1d9-05781db91fdc" + "ID": "954859da-6eaa-40ae-b98a-952845cc8255" } ], "Disabled": true @@ -1647,4 +1647,4 @@ "Formula": "页面反馈录入!$P$31" } ] -}//jOhV1rqIFcC/xLiHQNSy2bjMYZD21dbjae5My0i4v65NoPPfv+VkXFLF60vYTaIOukR1gvX4XOoBvPmGUNauRClEa2PGrfofwyRWQnr6EP4/P2AnmGV2nN0E+aoD5NcV35h9hkEoAJoSYoQHSYP9Yj6UQL7tPV34nl8RRv/BEH7isp6S3YBcPI0yc4i8zWmQbOXXA7ICFbo4i3YBNJcWJlVcrLYjNW2JYHS11nvKle8SfxIrLiTAHOLB88Bm2hPswU3yS7JZNFPvny1xDrIvoGLo2V6hU7ZHbWXSpfVNYgg7zpETVfeXnloL4wP5Wkkx2Iqpijj0cPWuRf3BmlGtkY4Nff/MTZjgyDDv0KULgv6RGpZn1ME7vBno92kpHvtLl03cML7lK1GusBM4+b+OLtr/WKEoSNwkcZ4wFqnVAU0pwTRft1TfXIheDbi6HQHN4fjNk0zhC8eSrIwBJoeQyU4B+TSz7CXr46vXqL6JTTcqDaPYSgiKX6DodcloutO8hvzERSFQ399H90T51tODXIgaHmQqMGw5HOlEidoi4YqtVYjikmsQEFvsrBC5HfPILmAN0zxoMOfoGzwA+aO9mf83iMRCYyMmzRTvRS0ZUAT/hQ4uNzHfNV0djc3fnouqOZCNXel6ryOqGu65FtbLGP07zSPmx61/SZ8CuDRZ2Esb5Lgm/yWglBqRrU+F4ILcqxQwnyjDg9g4lEzY1EMfNbiGT5inzq3jZ15ptf4Jb9S7jByMs2ODVuFisowaH7zkqMzTXJZSD4Vx3CVHtzSPXfoHSURt0BHEN86JAsWSDTOJ5BOBuG6YT33pH9r4gil6zb4s5c3rsctM6RKti4E4FYP/0sfCW4sGiluDiNcrGXgveOgSzz2f3bH2NCnKvkIjCAZ+FhdaRUnV2tCLOCd4YA==|920 \ No newline at end of file +}//UilAdbuR0mUzEkklIxZS7zgYBwObwJ630pujZIm6QeTOT5noZt83pDwFzoXtrOwQ2TVnR2Fe8VHhX1jSF+BziCIGMuQjoz0hcBeOhPFW9ESJU3ufvxj7ZpbYvJy5nTwsu3ke0DZIqYpbF+czhyxApMQYb0QGw2MDMAVXxDNO1Id1T/gcCkBCsGumFGc7VSZbQP0tcXRQH2cF6IuaFX/WsmkgERkoI3w326oGqoievOmqz11R7dXZtn6FLhjIZ2B5PHUHNmTlkTmiHNYT08Touvx4kgtWvUeSP0qKXfTt5V91jjWRYb1xToiNUnvc3Upn5hSHWWobm+scaiSSJpD4ftncFjg1pTst8cOatQq9pXTedE7alK8omp6isLfgcJdcL2GLYyQPJhKPIumDC5gn8ymSJHjILirbpY5jdvgBHJj9iOkZ6UiuTB85LvExgPYrvVc+t57BZmVYH41AA+MJh81RyY43mIZLaBadCxfuL6bQ7EjydeeA63owELTA0i9Rdac+HfRSk9ESN6iHVXBUtCUDDXK4UjGow/E6XrzDuMmA2ZkSX1jea88QjbrgBQAmYDslMo+6uwzOHS3pwDn9QMzk+V+2Zr4l0MTGOI5FKF4hcJ35f9HclM89lNdwPxQ4d2EWSv+L1oqevCVAkd8iomznBRsvIgLqmNmnzEzBfZ6nmlhga4rzEeZL4fTGm5wgIV8vMj6es5EVA+zosTC0NOB48YLx1jGdhfKtqrrtzTfz9DIAdu9yMAi37yjlXUAyfxVPAQOBbuNr6t3VtSVq5DXrug89gslG2TiTiroJ5KafvzJ0Y04ispMb1nme/hCrm2pmEiYPFR0407K70bn2iqo+Eev3RID7oiEgFpDRsuJ5cTLwSSSIInNXcmC+j+JX3xa/BWMLc0BiinK2QDWIRg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 56ae8da1..5e8eb85c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -544,7 +544,7 @@ } } ], - "LoadBindingDataOption": 1 + "LoadBindingDataOption": 2 }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", @@ -708,7 +708,12 @@ "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "处理人", - "GUID": "c49561fd-1d93-4084-9caf-54d2a56cf436" + "GUID": "1cf1f1f4-11f0-452e-9375-37f54462fab6", + "RelationBinding": { + "RelatedTable": "用户信息视图", + "RelatedColumn": "用户名", + "DisplayColumn": "全名" + } }, "ColumnName": "处理人" }, @@ -1321,4 +1326,4 @@ "PaperSize": {}, "Margin": {} } -}//Fjz4qxc3wWvqSKLt7O3sWCtTY8/dxkl2RhlzQx7URDDlevAlaqAqNa7lPSr3DbP1yiCjLOvvh76q2MICe6+SQC4TB6NBd1OH4fncmyp/o2hoJuevx1yefXh7urebln9TAmFhqx0eodyvSwa+qM84JWCi0mGene0CmA+mBnHUPBwPMNzoxHMGodJLN0EAD3awwBx7KRdF0uD1hDBFprmT6iSxz1MloU3jPGWo6IQauG36WTLfabON1Ot1ITRnGQfjLMzN8kkbUwfcAEorwLhUETEDXLyAsZL+7JnN+Q3X8KIj3A9hMHmr0HbU0WOnEiwkrp7B6GcU9lp0YKB2+jhkpls0GrGlWF/VdBplSKy+f/fMaUOgw+iFajlon8zgg5S1HC937/ExKy6Zkznk38zuedIzy2bYDTrRq64tEHJlvPBAtvbdfagqXFiG3hTlrTYhUHMM1/DRlNv0Du8L2IAF0ahWnqiXdhCb7GNdVC99b9NP4BQY8cvX/18sqjoJ3WhlPafciSk2zJJuyCOnH6oGXe9S6/WrC4xX6zGfsWyqU0v8Kgi3cYVzd1DfIBtOYn50TvTfgGE34BM4U76XTuuDS4zrw5AKF9WYhaHUiPPbFbdy+e2mJpK24HSIMykMy5M70WFxWqkxTJtFJwklXzBYcb8TSEwV7/3gwFtjiPr1paPLTPgchTCgkNRF47KBzTM8QFI6iCBMG3giqFzSuCmUmHsLvV6AwInySW+vhlzsQo+AvQ65PEn4CsUSRCyY95W5hbwXRHrkktwRWF9zVm18mPFOCDtPxZdMqb55TmDuKrXSv0voC5Vqu4mkMOAmGSIkK5UDO9vd0qD2lAhg5/SjGMbeckDyzPGl/8sFMijxpwlxiAs6mcrcegThniu8kmf12Hjxc3EWyaXT/NTj1enNaA==|920 \ No newline at end of file +}//20MHdpZg23jkq+TKRrvhtj4LiHDNaQIX3xQ0H2sSnbi73Dx0cTVoC4GDSZmMRDGnoSppTszEnfhMCdCmx2UBW1+p3J3Zi3jMe+93Oiz/4NQRDmK1kJcYZORD7KR1Xt+tH+8qkJhxlYiKmZ/mZqvz43BHSFXuUeU+lGbFZlZX3ELO7hk3fSumzDp2J8hsE3rapyoLjaOlOhk4cCQePPisP/lHCsIuYmHIm1sqltNaX/5jLkE4jtNl892IbPCmgoIiENvk3jnhpDvPm01U4gcM/pA43/xgJ/c2k+QBa3ugRYfFDdXznwp5VX19+bNEabL0G/QQblPsd/mJu7XMuTeghQPAnSUj9YOrgpuT7ERFowKI7df2G5YbKe72m05PAhSZ0Sal1iLNV5iBVjJazm0UQsDFRnsoNMKmjx394zLls0oWIkZmNXtDlfYOFJa9XC6EU1mFJcxmLH0WCv/nxLM5rtr0yxE5t0YJj3lgn8CPZl8S+tezjAFJnYYWHxk99fStIPsYDm/wOE9x09im9vevXKZSC4PJMPGnktdPNKzM7czHUX+v8SP+/y4g8KuwHTE8S7X+XoFPAvFJlygOy7Vxx7brQjDG3l2J+9vMOzJeq+HxLfI7uWt4fWmfFAdgKbTAOTBFUSI61xCcpyozXfLb/s5rh2PR2a9x7wa620DmxosKr21Noyv6nDYFE2XjSLLALZL7EGousUNbniLfp/EdO9nnSlnYS0dBUKuHEkmksFQSPwbRHAmwIqf0yuXvNx+c+Oz2odkmM51CmHBGZwuW49brZ4cj+VbcI1U+1L/DZ+P0cOeqDnBbpQbhYNwAFmlQArIXj6KU60ar51stSHXZud/l80y5X3UUCK5KJncQNkFeKs67iZS7H5lSncV6owIk0qH8yB/d8CloXL1jy2MH9g==|920 \ No newline at end of file diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index 9344943c..97f4c19d 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -227,6 +227,13 @@ "ForeignTable": "需求反馈登记表", "ForeignColumn": "发布记录ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "用户信息视图", + "PrimaryColumn": "用户名", + "ForeignTable": "需求反馈登记表", + "ForeignColumn": "处理人", + "IsDetailTableRelation": false } ], "Indexes": []