diff --git a/.collaboration b/.collaboration index e9040b10..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -542,17 +542,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:26:32.5558915+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", @@ -564,19 +554,7 @@ }, { "ModuleName": "PCPage/项目成员统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:28:42.7462744+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员统计.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员统计.rd", - "Pages\\5f448cc5e408484e9837a0183cf1365.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -588,21 +566,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:25:13.8122611+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -642,17 +606,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:23:28.9828365+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -1024,16 +978,7 @@ }, { "ModuleName": "ServerCommand/新增或修改项目", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:23:28.9823351+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增或修改项目.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除项目成员", @@ -1885,16 +1830,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:32:20.9734558+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2010,16 +1946,7 @@ }, { "ModuleName": "ServerCommandPrivate/填充项目初始化数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:26:03.8868719+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\填充项目初始化数据.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/项目表新增事件", diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 95ac67e8..920480e5 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -368,7 +368,7 @@ "BtnText": "知道了" } ], - "ID": "d506c3ef-fe13-4c2c-aadc-dfe9f1fa587f" + "ID": "8e28a361-1b59-43ff-a7ac-38f9b8838ed4" }, { "CommandList": [ @@ -467,12 +467,28 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "管理员", + "ParamName": "项目经理", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目信息!B19" } }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "商务经理", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!I19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "客服经理", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!P19" + } + }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "权限", @@ -592,7 +608,7 @@ "ReloadData": true } ], - "ID": "9b9a85c6-2026-4c68-bb8a-396cf5409e63" + "ID": "eff37a05-9bb1-47d8-9215-531b7225aab7" }, { "CommandList": [ @@ -607,12 +623,12 @@ "BtnText": "知道了" } ], - "ID": "7b778950-0529-43bf-8a0d-86522a6fa106" + "ID": "18eaf105-166f-4f3e-a02d-5072e7f67c36" } ] } ], - "ID": "a0ece134-59b2-4dc0-a37e-98b7474ca225" + "ID": "0fa8d365-5cf5-4268-876d-7f2bfc8a027d" } ] } @@ -2784,4 +2800,4 @@ "Formula": "项目信息!$B$19" } ] -}//2wSJG61CvXZ+3M3Qc6mKiuqdhmu2LWF82KawiVBbiOmD4Fg2roQ1lAxrnZyMzUlwyh1OjDkM6t4XZjRBUTlQACy6rIKcUjgP1wYqPiJO2P0cjRqCIYSoisKxjG1VmANQdY8uwkEMsZiu7ptKl2V9Bzd/tuxkeiiAiH8lCc9GX53g+hDvFB5/Q2+4be9LAyi96kiB6t8/yWZkCkCfi/ewjUnF4Lb8JdL1nMFnHEt7L6YiSqV7WX1++81fpPu9ypo65kfV/7qDIoeIU1k+wgcdcCSZ3rSFf/VaH3yKUM4EiugEAD+kaLaCYr/4MNoVw7zRCV45ZP+2AmnFAObm0hWzDvHojX+EXqYR1oJFfvSW2NxP+CWkPKCsk26dW8VEy2zHRanSkHQ705oNPydushNOGpd2yVdrp1999tlD3IZAQGjZx16u6lD0anq9EmrGaOjnotUlKNBzXjv8oQ4KOpqyWfG9Wj8YOc+cNT9iJ3CfejnVPcd0klCLpRVVAEvTqSd6wRFAnBvzpMpiGPXGuom6L6V9u4Y5GHYIcp2paTkcP1A4v314akwiVVaWs9Lmn2AiUbGAQAo3VYVQVzAy6z6QgXA0JqL4NyMSt3+WTM4QM+dEW+Xl21wHjDHWPb9Dcg59hIl9ruxMirJqtqp4ToFNUj7CCGp0mCS1eUcRgcrs9IyMLY6QJRsbynfuhCoJ7P0A4p5wKQ+esOyBzo2lzPCsdCdyVHtZAeBOwfeDJlUX3dGwsTRh6FFTIWzD0EEUQwzV8Nm1acIQkzNm16JLpcQzJfMajD5aOBJj2qn5wSsEptJOyhe3nDOifgNeEhBT0yPHfRW5XQlyUjKDuwiQ3gkEeafjhgpiwHjaE2nzsZiCdb0njWmdmpAtQZhO35w5GyiFkBBioiNl/UwBXX1ZVARWSQ==|920 \ No newline at end of file +}//4iIa1Wu5QmnrZslRfdlQ53GbeWpRt3RzG6vOYWiiTb2/vLVf5vxsxWrNE/clsNWTwp6zVqXiKm5G/zQLw1/1LM3JBUC3zNpIbysneCZWrT7fWktCgLwseQasIoL+NIllh8utHPklrZme+AACF4Sb1wn3rG6KR9cmGFbXWPr5fK/dUxL5RMuEEXCwSd5kVfIqb5AC0i0yF0hTA4WfkW77E96aEbmRd0/IjMkFt8KlfWt0vWfh6BoYn6N7uiI+iwqnlXJjP4bGTiyzHisZC44RXW3Mckf/KbBcxQpb2Ht6sk1as4TEsT7EBZ851zNvAvVegqzsPAs9AMGJdo0hM1wZ/ytpJf1OjWsGN5GyTB189LBNhYONakfF3Mt+QKS+M5r8VrbhphTFu2hba74hDvg5LNgGZlPCVZjH6yTTviTNCVmbM0y4Yxg0VZR3dvwSlmNFvpGg9Tr9clae6b1gG6qbHR9DRPAg7E5wWcBrMUy3qNhuU6mjlHZggUv3pfq+f7QsvDE2cesD+GcFSlxlSio6J/V623GnG6t8p+71/9uPcIvvun1RHSXXFuVrqq7wqlA8QmSLA61YohZBeXxFvAES3C8E3YZmz9KZDG2acU1fZO865kRvfOzyay+i5F01u5WgaJbQw8bfGXrr00/i/JBNtp7369/pdpuGYg79tIbr813Np/LAhwgsRfDU5EdN2XeRH/5DwlcFYvoQyKAdy8iDQMa4spWA++iHgDyDkPczxF5ze1vtLJ0Ej9I0FbrUfYKpLyu7VPYq+h9DNh8zplztFAwHSAPhADZrF4a1ef73GU2aOjA1hy/qW4i9EOySWFvv1nTAK/sifJ7AmyXqqckem+ZxmJWnaPseYPt+aaOnaFpgOUUOCX1M2vVvwIwRBL8K/g+Rz+fXHwV8GT0ClJwMMw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json index e83dfd22..f4c16480 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json @@ -42,6 +42,18 @@ "DesignLengthInPixel": 40.0 } }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 160.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 @@ -62,11 +74,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 160.0 - } } }, "InLogicalVisibleIndexes": [ @@ -1227,4 +1234,4 @@ "Formula": "项目成员!$B$13" } ] -}//nUDbNGLm2vaFYJnnQx7dh+cReBBZwtL/3YXGPIp41mXOI8O11RiMuJeKhJPzzy5HMhv9IOvj16RjAxpNyvPWAB+p1yHD4dpMTGjdSiT0ReVsbYQCAWmkbMhzT+kMLRNoq2ch6EFXtl6O6JgnFLfrf7JsrVBPEPilPwxEQMSYo2dlKtFyjSDdtl0WyCCH7vpIZrX+x0pSBcH1KVztwpAIL4QFrI74zjeCIjWCREr1T7qEt1XOLuaZQiYiBXz+cMUanArLq98+lxblT39VZiOunlg5VVdtfWQ4AId8dU62qyPBz6ZRJ5hOYOVIK+2MpJ/KnsczAuuw/A5i4TNcvz5YYG63NQJEJkj6dojV2plajo1X1KJPArcviC8J4dEQVsalpOVdMF9xO4KzYvdN6sTmMlnBHmM/tMj6Tvy0wrlwgDMdSjW13SM3ba/4C1Lq45qDvQYbWLKAbcoa7SmLkL2WyqHj5o2kjrbqldhFcJNCebUpRuXmmgoqUvw5kZudZMwwnfErYEqjWkwVentbTFMbG/I15K8ckZfEJcpBGdLt5q60DBAJIOGY9FSOelvMXwRgLMYwaXt+K6aQJxbxTG8OzkDusMkY0yvAAE3wjrcSYu27rWvOeIQ7eRUi/aui+CGSLzPH5XO/+JnoByY/eZsJxfj2CJi5UM7bFm0J61WqEjIVUwu/yZrjm5UZSJIB7UbChNwqIr9ewZb678LUY7R2CiWsoVdxvlmUfkbMVTwAcJBNetDljhjsC8DancTx43M/zpSs1DGOVErF1u3FFUjFCbxPARNTCxgpCpccKmnF0qwpGBp/EWW7WiDXb9eeWhk8IXqlnOYdGN6SVEiM4qdd8h2y6rmvUHllS5osUnA4FzExDdYF+7n7AitojGm3QRMfLZQBtFvvi4oNdcm7dsXdoA==|920 \ No newline at end of file +}//VcGZfAB9srlfG+VhOByFkTimuEZxEuEh9jABI3St1pc1tkhZ8EnEhOPxfIKcojOOPst9z6TGTut58XwO3wvNDkO5LyvtCL3fknPX3BdQlu+PTnQF24EfZO31WCQxt3d4moZ6yKWC/2wCgLLQoMd3KHDzMIbLU0eWdCDcmlCzvJ5Pvg6DLN0tceK6PcK5BwziT5ez0K+P7YDLDyMSyH0MsJDIo3REHdT0HRqrcfTCQD1Uy/w+Mm5JP9TWcJ2DIEcNa82pHwgxQ3Yc55zzJTKdw10zzmk9X0rNIAlI0zsrHPqD62q8RIG9zZF/KnmgzstAE+4uTeatTjQfzPk/scG0PFygxWdFJBHtd0cz9+zRtLHG4eMCKva5IN+iVYAMwsncJVMDD+Um9kf9g8ks7jMBnPctwkKjK1trJVGFE4TLfuzzI0OmPgRfEf72XC3DWj8Bdj6EdXubPGKZmZERFlLkeYVZ+YURkTn2pLLNzeHJAwicIPEXU8Yn3bMOgZmMse9oCk3PCROflJXvXM8wBOkSncSzwXwySoAQxgDh5AqxXo6owhMxopA8/0PQ0ByMdq4e6SFk+e3O/F7YDmjrac6ifkZJ5jt1Xwrh1w5ojsXSvQPM4OesS1rN7VFie1lXOcYgnm1PN4DUMi4Pj6pDncHfQ2MSyPf/XLgEKhR9O23CUKDneyhARdnt7eQx794GAoVPooBbEmh1dy+oEHHGcw90DfiSx9j6y1ywAkkkxlZFcA7GGHec5Nh732b6Kxx4aPuuLIR0wi02S6ZjglNkJ7kieyKNQF6M0LCmc0kT+Wh6IHP6FT4QvhXS27fVoMmZ8lBQH8ijIHF1e/oX9xNQYZAfotQzJfU4kYA+sJE8+BgpgB8cPU61PV9Zg/FC21anLGODTHNweTv6sqv4JqtQtpcmYA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json index 9ce7df9f..15bf526c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json @@ -2,19 +2,14 @@ "Rows": { "RowColumnAttachedInfos": { "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 198.0, "Mode": 1 } } }, - "Count": 2, - "DefaultSize": 32.0 + "Count": 1, + "DefaultSize": 198.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -194,11 +189,8 @@ "Count": 33, "DefaultSize": 32.0 }, - "Values": { - "0,0": "项目成员" - }, "AttachInfos": { - "1,0": { + "0,0": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "5f448cc5e408484e9837a0183cf1365", @@ -278,30 +270,24 @@ "StyleDatas": { "Styles": [ { - "FontSize": 13.333333333333332, - "Foreground": 0 - }, - { - "HorizontalAlignment": 1 + "HorizontalAlignment": 0 } ], "Types": { "Strs": [ - "Text 1 50", "Center", "Body" ] }, "CellStyles": { - "0,0": 0, - "1,0": 1 + "0,0": 0 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 1 } }, "Spans": [ - "1,0,1,33" + "0,0,1,33" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -326,4 +312,4 @@ "PaperSize": {}, "Margin": {} } -}//INEIYrxzJDbwa3hyZXcnYlPQkix299UrxbXk1HXni3b1CvTr2doipCMXr0ANaGFAPjbRWz1KRzYKFWug75PawbTzwGV1/QN/LGmYo7Qb3yp4s7Q56ajNP2zHiWe/ZNe796CjS22lu2MqWX8f1IJP22jJHpU0iBgmhv+SYd8xXrbst5C+QMIXjFmH+zF/VLW4b8Yqmln2+tV/h1I4WLUqkPOLe3RplPBxIa6a5ILYi8oQG9FEqOqGsXWwTFIyn00aElyzAkDiFyvg1M3WBrVo1w8pDBExdgZHB5mbgEQlAyeqvKH7M+z/+txEIoABpmpVMEnq9Wc2E9kEpVGfyHnrL/3cYX0xU+5WNtdBnujnxZC6D4GVJy63lXlZQsZdjivGQ1h5UGfxDD+AX9k6wPB8rRYzejC2ikuxQ2u9JIuxfE5NyDBu0q6rUme0JAgaIs1MWi5fZWNaGreKNhN1DulAfK/lSV+nuru3I9Q5bOIqMT6O//SC0io7Psi0FR1mlzyVbK2ksiV3ADj9mZTMnYbjRE4hnKgwkgqQDrlORz7iGwRRKtr5FI/R164dFy/fLqZLe/aRfNsiRie90mi3jTHy7dbH1eEGZG5PGtI5cVRgbvCya0JDb3zWffpf5ghQte8B0dslZlYjrOke2V980B9NrXFAwbozPwmANFat+8npyWhDVFvlgbTn4l1nxlkyU1Z5pJFi6b/ENdSqbrP3c9A7A1s43G6MOnNwHIY/txhvls2FIYtweaFeoPcXFp2roArz0UxhylNxvqEfmPjrS819L/xiuSQz1UCo/TfLjSHIrkhWiciH2yHgy1XW6arSxwB4NaNUFnedH2p/sUq2vbSqoxzpkUU3UnG/QqTaFRASa3MYrmpLcjez1nTaKDCZC+iAtdERAE8+NTpfKYdiwQpsuA==|920 \ No newline at end of file +}//pusyk2dTDNdZ2D/WRdhPnQXFcOPybuz7+kMFp+Bixz5/81Pl4CQ5XimRDn78Lif8FqLRiuiYsspSqFFTCdUoM31E1xtfsSpAd6FK0BRi1KMHFN+TS0kaNEYwpl9D1cq2+OJc/tTM8XJyJ7P8kM+v4XW3AqCLKDsfYRJ1z6nDvCvZooYgbfIZMCSF10KXjOKTYUc9I3KEg15kmM7x6athufZw6bliuclSFF6C9S+3Cw9r+dMj3N5ukpYfAEa1HZC8nBEM/aCkaaoiS2rrX2ws9TJgZRo3hhak/vXMNuPsYwRQEOrgrDYEq9p7d1mJQV8OBlV1k79th5mLHY9d8oiDsGQ7cdVDjG0A6htplNLXjYhFHAfu0P2YKuquWjeLPLVcYBpyTGGDUde2SMNPp8nWW/0aFMohNeb26bXld5bLRgtHYMJOqHYFTBswpjBMkN4jmZSTKT9ltIfE93sXRDH5CpdiNyXLIXlq3qy7wEjUIuL13T1l0sRvzQBJSITu0ewJJ2sjq8X4/n+/nmTxPuBNXhPBv6XZYQboQhMXDIwoPrTnn+uywCyYPQRPODxJkqAAAvhPvPTX0MJbQZ7r/h7AG7jQ09eBTyX0MvOiC/2HRDS5wuV9pRcaKxGjEDlfX76+WKg5o4BjDWrquRgMGY8KrnqBsb45F0czw8Td7lLVIRcsjCFSjAnw73twx/V06YskZZVdDNapplzM9sZh4Cj9eKEvN5fmYWsO+zSbdYmHgwJmDORZgAQXwPyU6I/+ZvkP5HOSJDLMnwdSLhc1GXlIx7a7nSfMehhtNBRYW0ll1RfGIOzUr87jVorCXkk01VJnr/1c7P6jDft/ZZBZ9VHmtnzK2IDvn8oI3KWRYXIBCcMAAUX2bEfvfCYDLvqALrqUroJIZ3D6EznLaG3UNS3ORg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd index a191ffd0..68c88b0f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 33, - "RowCount": 2 + "RowCount": 1 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 112359a8..a02e9aa6 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 82.0, + "DesignLengthInPixel": 183.0, "Mode": 1 } }, @@ -19,26 +19,47 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 224.0, - "Mode": 1 + "DesignLengthInPixel": 35.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 169.0, + "Mode": 1 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 284.0 + "DesignLengthInPixel": 24.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 224.0, + "Mode": 1 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 284.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 278.0, "Mode": 2, @@ -50,13 +71,13 @@ } } }, - "8": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 9, + "Count": 13, "DefaultSize": 24.0 }, "Cols": { @@ -264,8 +285,11 @@ }, "Values": { "1,1": "项目概况-关键数据", - "3,1": "项目成员统计", - "7,1": "项目甘特图" + "3,1": "三经理", + "4,1": "项目三经理成员", + "6,1": "项目成员", + "7,1": "项目成员统计", + "11,1": "项目甘特图" }, "AttachInfos": { "1,1": { @@ -336,13 +360,20 @@ "format": "yyyy-MM-dd" } }, - "3,1": { + "4,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目三经理成员", + "OverflowMode": 1 + } + }, + "7,1": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目成员统计" } }, - "5,1": { + "9,1": { "CellType": { "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", "EChartTitle": "Echarts图表", @@ -420,7 +451,7 @@ "Config": "{\"option\":\"\\nconst {\\n \\\"日期\\\": xAxisData,\\n \\\"工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\n\\n\\noption = {\\n title:{\\n text:'工时上报趋势图',\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid:{\\n left:25,\\n right:25,\\n top:55,\\n bottom:30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine:{\\n show:false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine:{\\n show:true,\\n lineStyle:{\\n width:0.5,\\n color:'#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,0)'\\n }\\n ])\\n },\\n }\\n ]\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\noption = {\\n title: {\\n text: '工时上报趋势图',\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid: {\\n left: 25,\\n right: 25,\\n top: 55,\\n bottom: 30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine: {\\n show: false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine: {\\n show: true,\\n lineStyle: {\\n width: 0.5,\\n color: '#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,0)'\\n }\\n ])\\n },\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } }, - "7,1": { + "11,1": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目甘特图" @@ -436,22 +467,32 @@ "FontSize": 13.333333333333332 }, { - "FontFamily": 1, - "HorizontalAlignment": 2 + "FontSize": 14.666666666666666, + "Foreground": 1 }, { - "FontFamily": 1 + "FontFamily": 2, + "FontSize": 14.666666666666666, + "Foreground": 1 }, { - "FontFamily": 1, + "FontFamily": 2, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 2 + }, + { + "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 3, - "HorizontalAlignment": 2 + "Foreground": 4, + "HorizontalAlignment": 3 } ], "Types": { "Strs": [ "Background 1 -15", + "black", "Body", "Center", "Text 1 50" @@ -469,153 +510,160 @@ "2,32": 0, "3,1": 2, "3,32": 0, - "4,1": 2, - "4,2": 2, - "4,3": 2, - "4,4": 2, - "4,5": 2, - "4,6": 2, - "4,7": 2, - "4,8": 2, - "4,9": 2, - "4,10": 2, - "4,11": 2, - "4,12": 2, - "4,13": 2, - "4,14": 2, - "4,15": 2, - "4,16": 2, - "4,17": 2, - "4,18": 2, - "4,19": 2, - "4,20": 2, - "4,21": 2, - "4,22": 2, - "4,23": 2, - "4,24": 2, - "4,25": 2, - "4,26": 2, - "4,27": 2, - "4,28": 2, - "4,29": 2, - "4,30": 2, "4,32": 0, - "5,1": 3, - "5,2": 3, - "5,3": 3, - "5,4": 3, - "5,5": 3, - "5,6": 3, - "5,7": 3, - "5,8": 3, - "5,9": 3, - "5,10": 3, - "5,11": 3, - "5,12": 3, - "5,13": 3, - "5,14": 3, - "5,15": 3, - "5,16": 3, - "5,17": 3, - "5,18": 3, - "5,19": 3, - "5,20": 3, - "5,21": 3, - "5,22": 3, - "5,23": 3, - "5,24": 3, - "5,25": 3, - "5,26": 3, - "5,27": 3, - "5,28": 3, - "5,29": 3, - "5,30": 3, "5,32": 0, + "6,1": 3, "6,32": 0, "7,1": 4, - "7,2": 3, - "7,3": 3, - "7,4": 3, - "7,5": 3, - "7,6": 3, - "7,7": 3, - "7,8": 3, - "7,9": 3, - "7,10": 3, - "7,11": 3, - "7,12": 3, - "7,13": 3, - "7,14": 3, - "7,15": 3, - "7,16": 3, - "7,17": 3, - "7,18": 3, - "7,19": 3, - "7,20": 3, - "7,21": 3, - "7,22": 3, - "7,23": 3, - "7,24": 3, - "7,25": 3, - "7,26": 3, - "7,27": 3, - "7,28": 3, - "7,29": 3, - "7,30": 3, "7,32": 0, - "8,1": 3, - "8,2": 3, - "8,3": 3, - "8,4": 3, - "8,5": 3, - "8,6": 3, - "8,7": 3, - "8,8": 3, - "8,9": 3, - "8,10": 3, - "8,11": 3, - "8,12": 3, - "8,13": 3, - "8,14": 3, - "8,15": 3, - "8,16": 3, - "8,17": 3, - "8,18": 3, - "8,19": 3, - "8,20": 3, - "8,21": 3, - "8,22": 3, - "8,23": 3, - "8,24": 3, - "8,25": 3, - "8,26": 3, - "8,27": 3, - "8,28": 3, - "8,29": 3, - "8,30": 3, + "8,1": 4, + "8,2": 4, + "8,3": 4, + "8,4": 4, + "8,5": 4, + "8,6": 4, + "8,7": 4, + "8,8": 4, + "8,9": 4, + "8,10": 4, + "8,11": 4, + "8,12": 4, + "8,13": 4, + "8,14": 4, + "8,15": 4, + "8,16": 4, + "8,17": 4, + "8,18": 4, + "8,19": 4, + "8,20": 4, + "8,21": 4, + "8,22": 4, + "8,23": 4, + "8,24": 4, + "8,25": 4, + "8,26": 4, + "8,27": 4, + "8,28": 4, + "8,29": 4, + "8,30": 4, "8,32": 0, - "8,33": 1, - "8,34": 1, - "8,35": 1, - "8,36": 1, - "8,37": 1, - "8,38": 1, - "8,39": 1, - "8,40": 1, - "8,41": 1, - "8,42": 1, - "8,43": 1 + "9,1": 5, + "9,2": 5, + "9,3": 5, + "9,4": 5, + "9,5": 5, + "9,6": 5, + "9,7": 5, + "9,8": 5, + "9,9": 5, + "9,10": 5, + "9,11": 5, + "9,12": 5, + "9,13": 5, + "9,14": 5, + "9,15": 5, + "9,16": 5, + "9,17": 5, + "9,18": 5, + "9,19": 5, + "9,20": 5, + "9,21": 5, + "9,22": 5, + "9,23": 5, + "9,24": 5, + "9,25": 5, + "9,26": 5, + "9,27": 5, + "9,28": 5, + "9,29": 5, + "9,30": 5, + "9,32": 0, + "10,32": 0, + "11,1": 6, + "11,2": 5, + "11,3": 5, + "11,4": 5, + "11,5": 5, + "11,6": 5, + "11,7": 5, + "11,8": 5, + "11,9": 5, + "11,10": 5, + "11,11": 5, + "11,12": 5, + "11,13": 5, + "11,14": 5, + "11,15": 5, + "11,16": 5, + "11,17": 5, + "11,18": 5, + "11,19": 5, + "11,20": 5, + "11,21": 5, + "11,22": 5, + "11,23": 5, + "11,24": 5, + "11,25": 5, + "11,26": 5, + "11,27": 5, + "11,28": 5, + "11,29": 5, + "11,30": 5, + "11,32": 0, + "12,1": 5, + "12,2": 5, + "12,3": 5, + "12,4": 5, + "12,5": 5, + "12,6": 5, + "12,7": 5, + "12,8": 5, + "12,9": 5, + "12,10": 5, + "12,11": 5, + "12,12": 5, + "12,13": 5, + "12,14": 5, + "12,15": 5, + "12,16": 5, + "12,17": 5, + "12,18": 5, + "12,19": 5, + "12,20": 5, + "12,21": 5, + "12,22": 5, + "12,23": 5, + "12,24": 5, + "12,25": 5, + "12,26": 5, + "12,27": 5, + "12,28": 5, + "12,29": 5, + "12,30": 5, + "12,32": 0, + "12,33": 1, + "12,34": 1, + "12,35": 1, + "12,36": 1, + "12,37": 1, + "12,38": 1, + "12,39": 1, + "12,40": 1, + "12,41": 1, + "12,42": 1, + "12,43": 1 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 2 } }, "Spans": [ - "3,1,1,30", - "1,1,1,30", - "1,33,7,11", "7,1,1,30", - "5,1,1,30" + "1,1,1,30", + "1,33,11,11", + "11,1,1,30", + "9,1,1,30", + "4,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -654,7 +702,7 @@ "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$6" + "Formula": "项目概况!$B$10" }, { "Name": "关键数据", @@ -662,11 +710,11 @@ }, { "Name": "项目成员", - "Formula": "项目概况!$B$4" + "Formula": "项目概况!$B$8" }, { "Name": "项目动态", "Formula": "项目概况!$AH$2" } ] -}//FS0nMoWM5LWlRHHbP2nQJqGI6nYH+K25ST95mXp7EjZlstMBm2rpmyIuPjx3fanh9w024LnsfLSIa43QF4KQ5OT+bm8laW/ag/TJG2ju1P3JaKXfjCkdDSCDJx7SdIqqk15LSeNm9jI8RCNZ/mrOlQro2WvSPma02Bb++Ah+DR3dXkUYZc8YYqmgLvN/DrQjOggsCnNhLmYDJLMJqaSuPAA+itCKh9jN6sSt06Iv6orSTOlZePcGieKU3mCxDGfWZGckVeofmostb/SGgyiDJOD5Z8KrVdCnYI1Pzq6ps7mBOk7ZGDaVz2NSs+hWZ5YX59MvXjV6Bb7GG7yIVKbnd1smcsY2LIJtI7e1wOb+c99TA0fysL77w3b4eRh0s2FUeOsHRTtdd8bS6ilG7mXewOSLaBPLRpCnp23Issy2ysDN+ZvadYsNlwz9DivYneSB36s34+vzIED6fBFXla4D+53Ylld3fq+JZNf8Wpnt4FgVGKjPQoOFAVIbZecmmEX79/y9+bH7x4v3pb9zf0+q+8kdgw724ImI2zEfxoSkb74Zgucf5dwhyTiZMXG8FxboGS2AYtf0RC2i8haypNqLiAJn8RXR9GooXk8aIcgc25EH07kUZZl7gRD5Z305ZvgWalzokXeIIyTKFo+y9SX1SnWQKqO0FQV5aQTer3TllCZhxYuErxPezIDrLb6LYmEV3Oz1uHsI+XRy0VOgeuEpjrmbT4Hpy2rESpu8HyCTSO2DbsL7TulzRHkw7O//2/tV9B6Iy7x26dmbTZxb9AtYQLfmQwAY2P+WNtYvJKEqN52lTHhxXgP8Dwy4QVj2kZM+PxfzaWdBqaI5ArjPtCWLCpOkCbxOlbOwze8IBy8u0FzC2aKJR+6rP6flVR1rbqU967iydF/PtvyjkvLrX91AIQ==|920 \ No newline at end of file +}//I8h1t4l6UhiR6g4X71//r7yFL0AxdT4syZ+cAEJmUw/ImDQgcvZL/sxvSPuTQLM49yc+OAhAqHy1TZFX6e+FSmHS9wNAwKXr7GiLvtTaQ9YRXr1HFKAZ4DId7BSLe7h15OdB2rSEANm14lb/KCVAyIa+ettgD43HmoZwj7XPocr9vmurC7MMb6ZBSO50RLUdNWAcYQGZCkEwSBmIc+EVp+D1hV5DcGlM97LCGhvwNQZ7ymPDOrXFfSfknkgUW+ybO7z7L0X+38N1/dHXxyvBHyKsRYUDZOmGHUYz4v0k4ckMUwKStoHMTbzBoSE5QmY0ZJkWx3UXbbKbEZ4aXc2G/9CkcMJHDFvYXtY5TFbKEJ8FdwfHF4uMQQpPh8vnV12uAJcGvcPbH9+7LBEixKADXf/nG6ah5Bp5qLISwi4DsFVPKNgYEJDyx+108BQtxXvNDD8KRQoKUCyx/qhSpGNjmU8byd6yWdqr/peHGUQj7Glxv0LutSGBZjQ4v/NvV3Tm6euMLLuEMIegmsTCoctVFfH+ox6/m35npAK3WP0NuN0mC8EI2E4UqEQ9bp8ti3eRqatcw2q/UJeJZjA0zfHFivnlqH0UbQmMfvQuwHEow4BQbtvUGEqm7KD9fUqXJC3wAyuvoaMdrflPdY3xri2nxjtPFLGdXABX1JEUXCu3kMb+ziDRT4jGyX1jC7Q2Xy14RWDmFT61kjAxhw8zAiVsrrZXRl7EaiVl3mAkTLq8XkKVDkFIiPj3lsgz84VRGhhRp2hq/dGdRArhFXChEiDKwZnwbUlK9bKBWtrwu221yAmstXW4RhdaE5Bfg5Snvfx754JznCbsePMZ6FUx7T0hwuiwHYRpPy6nS4NcdscndjdZRCE+FZMZGVUR0bfy2LmIxWdjwjt00sJvt1trWS39ug==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index f49fe150..8ec4e5fd 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 45, - "RowCount": 9, + "RowCount": 13, "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$6" + "Formula": "项目概况!$B$10" }, { "Name": "关键数据", @@ -13,7 +13,7 @@ }, { "Name": "项目成员", - "Formula": "项目概况!$B$4" + "Formula": "项目概况!$B$8" }, { "Name": "项目动态", diff --git a/ServerCommands/项目/填充项目初始化数据.json b/ServerCommands/项目/填充项目初始化数据.json index f915a7ce..7c286317 100644 --- a/ServerCommands/项目/填充项目初始化数据.json +++ b/ServerCommands/项目/填充项目初始化数据.json @@ -23,7 +23,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "f7a65ed7-4765-4780-9f9f-fe529c90475b", + "GUID": "e16e618b-d900-4dc8-b3ce-06b26ea359e5", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -32,7 +32,7 @@ "ColumnName": "项目状态" }, { - "GUID": "4a60eee5-70ca-4880-aee0-54e898e2e36d", + "GUID": "a659001c-54c2-4d16-b84c-c8b208e45e93", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -41,7 +41,7 @@ "ColumnName": "项目经理" }, { - "GUID": "488f41ae-2ebe-4f01-b871-5356a83d7545", + "GUID": "beb3f817-ff70-4858-9832-8672b7f651e4", "BindingInfo": { "TableName": "项目表", "ColumnName": "商务经理", @@ -50,7 +50,7 @@ "ColumnName": "商务经理" }, { - "GUID": "02092580-bdb8-43d0-9cb2-369c04a34c29", + "GUID": "001277bb-7462-4aee-8d8c-f250d69f5a35", "BindingInfo": { "TableName": "项目表", "ColumnName": "客服经理", @@ -59,7 +59,7 @@ "ColumnName": "客服经理" }, { - "GUID": "64ee4898-87cf-426a-9c38-e898419aba3c", + "GUID": "18130300-e33e-4fc8-8bea-885404ddf1a4", "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户", @@ -68,7 +68,7 @@ "ColumnName": "所属客户" }, { - "GUID": "396b8beb-b5aa-49b1-8f92-19dce38d5b52", + "GUID": "8750890b-8b2c-4ac6-8b06-5ed440459b26", "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", @@ -82,7 +82,7 @@ "ColumnName": "对接人" }, { - "GUID": "b4413120-7e42-4f8c-a8b6-f19095dee4f7", + "GUID": "e625d7df-2702-4a73-a5c4-fe04a65ebb78", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -110,7 +110,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "d84f769d3cd54a1aa4b58e6951d7b637" + "ID": "90dcc7be6eb84c7eabb0d04691bbfa71" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -328,7 +328,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "86e9bc9c-503f-41b0-a010-e4e45cc11e09" + "ID": "1c544125-fa9d-4f1f-9cef-29f5f84eec6b" } ], "Disabled": true @@ -484,7 +484,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "0863dd7e-59d1-406b-87be-953265a1bb03" + "ID": "baebb602-4a77-4f0d-84cd-fdac647c19c1" } ], "Disabled": true @@ -552,7 +552,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "272582fb-8469-4f14-a0d3-b8bc29eee145" + "GUID": "04d9d919-c992-485a-a3df-faac45ff4b70" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -563,7 +563,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "88379a42-c183-4a88-ac28-6f5839306f45" + "GUID": "7e0725c7-4de4-4b7e-99ab-172532af0132" }, "Value": "客服经理" }, @@ -571,7 +571,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "0acdb42e-d714-4135-a19d-51803d05a8c8" + "GUID": "384f131b-a930-4547-9dbe-958828ca5254" }, "Value": "客户与开发团队的桥梁，负责商务、沟通事宜" }, @@ -579,7 +579,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "30d14a09-6496-4609-bbfc-e89f260095b2" + "GUID": "fb3990d0-bef3-40f0-b669-0a87aaa2ffab" }, "Value": "0" } @@ -596,7 +596,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目ID", - "GUID": "d3bf612f-597e-4c4a-8d73-e5e789b8b60c" + "GUID": "df1a9a96-8e33-4a12-89d6-7ea360f64ebe" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -607,7 +607,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", - "GUID": "3e000f19-91c8-4858-8a9d-86d792fe1a47" + "GUID": "ea6b2244-7881-4928-aff9-2799b895c15e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -618,7 +618,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "岗位ID", - "GUID": "8b73ee3c-9620-4b9e-993a-9bc0fb65190a" + "GUID": "94405263-845d-4a02-9539-ab641999538c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -629,7 +629,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "默认时薪", - "GUID": "c921a27d-c492-4f67-b3be-bd484c77a870" + "GUID": "f11fd4a7-06bb-46f1-9061-cfaed818bd0c" }, "Value": "0" } @@ -637,7 +637,7 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "7d8b5496-d844-4499-b041-aae015963591" + "ID": "070eec14-8ca8-45d5-a727-19d890ba17c9" } ], "Disabled": true @@ -704,7 +704,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "cf287984-392b-4664-8286-1a6aa9e745e5" + "GUID": "e2105d0e-4eff-40bf-8772-83a77dc5109d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -715,7 +715,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "7a175204-6907-4d79-8d66-69e975a756a2" + "GUID": "7c67adb9-2e23-4016-b078-a3165b0be5a8" }, "Value": "开发工程师" }, @@ -723,7 +723,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "6cbafaf9-5207-4b30-b0cf-9c358f2f1bce" + "GUID": "e9ae5818-05e5-4717-b0e7-564dac22c861" }, "Value": "负责完成项目经理指派的各个开发任务" }, @@ -731,20 +731,71 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "e695507b-97c6-44af-b9ea-195bc4697b26" + "GUID": "14da5603-944c-45c2-a492-3d329c68acc3" }, "Value": "0" } ], "ParamNameToSaveNewRowValue": "开发工程师岗位" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "dd3490f2-db11-4098-8030-ca752a9e31a2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "aae437cd-79da-42a6-b052-df063e0abc31" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.项目经理" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "3796d0e9-33bf-4a66-ad85-46641c978695" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开发工程师岗位.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "579298f7-1543-497e-800d-58597c82bb07" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "商务经理岗位", + "Disabled": true } ], - "ID": "4d720608-c3e5-41f2-a705-e07bfde14fd3" + "ID": "19f3178b-c214-4f60-821b-dbf1c667997c" } ] } ], - "ID": "8133bc78-466e-4f85-8de9-18e759248765" + "ID": "7d520a04-65b1-41fe-b8af-3b253e44b8e5" }, { "CommandList": [ @@ -754,7 +805,7 @@ "Message": "请先配置项目客户及客户对接人" } ], - "ID": "e6ef8fe7-8a96-45ac-a9c6-a6a514538b6f" + "ID": "27172122-a8d4-463c-8694-45a8619be24a" } ], "Comments": "这里对岗位进行逐一判断，没有就加上" @@ -970,7 +1021,7 @@ ] } ], - "ID": "130e9ad7-a9c4-4ae8-bd5a-d1f69f4a2846" + "ID": "3995a844-c7e7-4ed9-b767-0937b9a973e9" } ], "Comments": "这里填充默认的四种任务分组" @@ -981,7 +1032,7 @@ "Message": "已完成" } ], - "ID": "cfde9bc9-46b2-416c-ab77-e37be7539245" + "ID": "18d08939-6833-4410-8c1f-f0d54251b9df" }, { "CommandList": [ @@ -991,12 +1042,12 @@ "Message": "请先设置项目经理" } ], - "ID": "0803b963-218b-4ad9-bdde-b526619bc19d" + "ID": "25c68d3c-00c5-472b-a8a8-0018862b61e4" } ] } ], - "ID": "38cf312f-c652-41c5-b2a3-fedf011d4b1e" + "ID": "366808b2-5424-45f5-bfd9-8955a1e56a8d" } ] } diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json index 5a8a947e..1777bb94 100644 --- a/ServerCommands/项目/新增或修改项目.json +++ b/ServerCommands/项目/新增或修改项目.json @@ -62,7 +62,19 @@ "DataValidationInfo": {} }, { - "Name": "管理员", + "Name": "项目经理", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "商务经理", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "客服经理", "DataValidationInfo": { "IgnoreBlank": false } @@ -125,7 +137,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "33d50656-3216-4c8f-be14-4af6b5f66709", + "GUID": "568517aa-dcb6-4acb-8389-d843a3d53cbb", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "严格模式", @@ -134,7 +146,7 @@ "ColumnName": "严格模式" }, { - "GUID": "c2db4524-4543-413d-b6f0-5faed4ffc5e1", + "GUID": "68d37fb9-1bdc-4e23-8789-f3ea45608398", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目经理", @@ -143,7 +155,7 @@ "ColumnName": "项目经理" }, { - "GUID": "0f709b85-7855-4ffd-aa1c-2c77e43dae6b", + "GUID": "2176078c-2d00-408f-b210-1216417571f6", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目预算工时", @@ -152,7 +164,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "434ca903-9f8b-4d44-8987-cbd1540bb52e", + "GUID": "4f38bff4-4d90-4290-9b6b-b995e016be30", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目预算费用", @@ -161,7 +173,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "d1000f52-2e9d-451b-8992-d4cc48d52edf", + "GUID": "864a58bc-919e-4584-8013-499460b08921", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目总核定工时", @@ -170,7 +182,7 @@ "ColumnName": "项目总核定工时" }, { - "GUID": "951736e8-83cf-4c62-994d-6646d688c692", + "GUID": "cfc46f0b-3d02-422f-84bb-cbe5e07a7f38", "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "已消耗成本", @@ -193,7 +205,7 @@ }, "TopCount": "1" }, - "ID": "8918cb2c149640419f57ed025694bb6e" + "ID": "fa009967493940df85397d75d99f79f9" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -240,7 +252,7 @@ } } ], - "ID": "21ef7738-6fbd-4023-a4f3-2c962707083f" + "ID": "dca6638c-fbbb-49f6-820a-65decb0ef937" }, { "Condition": { @@ -268,13 +280,13 @@ } } ], - "ID": "8f0a643f-0ba6-4959-8f73-3c340863f642" + "ID": "6f80bdfb-bc20-49fc-b119-166ad83d031d" } ] } ], "Comments": "如果是更新项目，且改变了严格模式，那么就要校验。超标就不允许切换", - "ID": "30dddffc-2a20-4b09-b409-d445c547a03a" + "ID": "def0021c-b91e-4702-835d-f71b188af071" } ] }, @@ -300,7 +312,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", - "GUID": "4a77b2dd-1ccc-46e6-8218-ee1c29b1a0bb" + "GUID": "4310fd16-c694-417f-8fca-06dad96f23e4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -311,7 +323,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目代号", - "GUID": "cfbbaef2-4de2-48dc-a87b-230f27b7b290" + "GUID": "bd70daf4-58e3-4939-895f-e5ec33476883" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -322,7 +334,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目简介", - "GUID": "cb83085f-f922-4d7f-82e0-47dbdf7a94d0" + "GUID": "1ab53639-a75a-4c4a-9db8-9c698756897a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -333,7 +345,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目封面", - "GUID": "9ad7f9b2-95ea-4789-a865-51fa7650e142" + "GUID": "b7f77d1c-48ff-42e5-96ba-3adf94d57e6b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -344,18 +356,40 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", - "GUID": "e1c08af9-ee35-4f6f-be2b-bb5e1044a827" + "GUID": "7f3322c6-f9fb-4d31-a800-2c5c631b391f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=管理员" + "SerializeProperty": "=项目经理" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "b1687f6b-d993-4613-bb53-2515008a4cc5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=商务经理" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "5444fd99-a1c9-4a13-9ab6-39d7763b21e9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客服经理" } }, { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", - "GUID": "cc97e502-f24d-4ea3-8c62-3e932074154c" + "GUID": "0b04e023-b307-4dad-87b6-6dfe2e010fe8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -366,7 +400,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户", - "GUID": "d63618c7-475a-4e5d-837f-e807183c2ef1" + "GUID": "ec90cbd1-aa28-4bb2-b497-abf994496072" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -377,7 +411,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", - "GUID": "2b79c431-9b82-4ef2-972c-b0e21e706560" + "GUID": "8af93882-b0c1-463b-ac96-bbfaa1d3ac4c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -388,7 +422,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "公开", - "GUID": "bb1169cf-e40f-4529-97f4-5f12dd45fbf1" + "GUID": "462814c5-198a-4907-9cbf-43b5c059c47a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -399,7 +433,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", - "GUID": "0056379a-c3fb-4d91-8946-4421bd818a4c" + "GUID": "021138c2-22f0-44e0-bdce-32bba40cee25" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -410,7 +444,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "计划开始日期", - "GUID": "676824b7-b173-4e44-bf02-e43e44437a79" + "GUID": "a75b558c-241b-4ed8-b71c-8afc3166d1c9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -421,7 +455,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "计划完成日期", - "GUID": "c131ae4a-325f-4a2f-86d2-63cff4323449" + "GUID": "79c40523-15ff-4b80-af97-70faaa57ccbd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -432,7 +466,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目方案", - "GUID": "d4bae995-6a31-48ea-9d79-fcbdb5e38fb1" + "GUID": "34e6356b-c227-42a4-aab1-4bd1d476c563" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -443,7 +477,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "预算方案", - "GUID": "61350024-f231-486e-b6ad-5e9166ae5e14" + "GUID": "b223d926-dc11-414b-bed2-a180bf5bddc1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -454,7 +488,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "网络资源", - "GUID": "161d79bf-6b79-4c07-b5e4-87a5ad76d24e" + "GUID": "416875f8-a42b-4ceb-84dc-f05a765bf68c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -465,7 +499,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "开启反馈收集", - "GUID": "695630ae-19a8-41d0-88ba-fa497c50c1fd" + "GUID": "43c5823b-ccf5-4701-b281-94b3ea1254d4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",