From 153cbffd7a18d95dbac52ba6b35e1c332c967e2d Mon Sep 17 00:00:00 2001 From: cuckooent Date: Thu, 21 Aug 2025 22:15:20 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91","MessageType":2,"Modules":[{"State":1,"Type?= =?UTF-8?q?":7,"Name":"Table/=E9=9C=80=E6=B1=82=E5=8F=8D=E9=A6=88=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=8D=E9=A6=88=E5=B7=A5=E5=8D=95"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Ty?= =?UTF-8?q?pe":1,"Name":"PCPage/=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-Gitee?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E8=AE=A4=E8=AF=81"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8F=8A=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A2=84=E7=AE=97"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 70 +- Pages/个人中心/个人中心-Gitee信息.json | 30 +- Pages/个人中心/个人中心-Gitee信息.rd | 20 +- Pages/个人中心/个人中心-三方认证.json | 44 +- Pages/个人中心/个人中心-三方认证.rd | 28 +- Pages/个人中心/个人中心-基本信息.json | 34 +- Pages/个人中心/个人中心-基本信息.rd | 16 +- Pages/项目/项目反馈/处理反馈工单.json | 507 ++++++++++----- Pages/项目/项目反馈/处理反馈工单.rd | 24 +- ServerCommands/项目/增加项目及任务预算.json | 674 +++++++++++++------- Tables/需求反馈/需求反馈登记表.json | 14 + 11 files changed, 870 insertions(+), 591 deletions(-) diff --git a/.collaboration b/.collaboration index e6a9caf5..365c102d 100644 --- a/.collaboration +++ b/.collaboration @@ -170,16 +170,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T22:06:17.5946431+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/反馈类型表", @@ -847,17 +838,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T21:55:31.4924057+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目任务分组详情", @@ -1309,17 +1290,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T21:35:36.184167+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", @@ -2791,43 +2762,14 @@ }, { "ModuleName": "PCPage/个人中心-Gitee信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T21:35:36.1842492+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-Gitee信息.json", - "Pages\\个人中心\\个人中心-Gitee信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-三方认证", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T21:35:36.184311+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-三方认证.json", - "Pages\\个人中心\\个人中心-三方认证.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/增加项目及任务预算", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-21T21:57:05.2843685+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\增加项目及任务预算.json" - ] + "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/个人中心/个人中心-Gitee信息.json b/Pages/个人中心/个人中心-Gitee信息.json index 6bcfee78..41bbd782 100644 --- a/Pages/个人中心/个人中心-Gitee信息.json +++ b/Pages/个人中心/个人中心-Gitee信息.json @@ -403,7 +403,7 @@ "BreakpointIdentity": "85cf9a05-117e-4b86-b639-3d6b69064e97" } ], - "ID": "b3def144-0c35-4956-b922-1f4195fb54fd" + "ID": "c177fc18-d62c-47e6-9ebd-1fc0434e30b3" }, { "CommandList": [ @@ -419,13 +419,13 @@ "BreakpointIdentity": "70a5819b-b381-4ed8-afc9-f440f4681138" } ], - "ID": "e37d8226-c1ac-4fe1-919e-cf27b33dbd70" + "ID": "bc16b909-cd0c-4fa9-b2ba-6dd1fc76bef8" } ], "BreakpointIdentity": "2833662b-dbb2-49d3-8594-8cda6b296b95" } ], - "ID": "f3818b6f-7f05-494d-b750-fdc580a3a33b" + "ID": "91dbce8a-407b-46fc-8e05-833bd3472ed8" }, { "CommandList": [ @@ -438,7 +438,7 @@ "BreakpointIdentity": "79a909c8-0713-4331-8f8f-c2dc35bfe582" } ], - "ID": "4ede19bf-5c02-41cc-a4b0-548a0b6f2a6b" + "ID": "b4297f6c-f7aa-4f0d-b9c8-551f8d736570" } ], "BreakpointIdentity": "c645cc3f-ee31-42fd-afbf-de8db97e80f2" @@ -803,28 +803,12 @@ ], "CustomNames": [ { - "Name": "姓名", - "Formula": "#REF!" - }, - { - "Name": "邮箱", - "Formula": "#REF!" - }, - { - "Name": "负荷", - "Formula": "#REF!" - }, - { - "Name": "时薪", - "Formula": "#REF!" + "Name": "Git密码", + "Formula": "'个人中心-Gitee信息'!$F$6" }, { "Name": "Git用户名", "Formula": "'个人中心-Gitee信息'!$F$4" - }, - { - "Name": "Git密码", - "Formula": "'个人中心-Gitee信息'!$F$6" } ] -}//3JcmI8e13rRVlGbEzCUpnxBoSej3pZBC8CMBUFzuqVXD3YvlVOzYB3EAwBuvLPA+Rt4bzEHNfDTKNzMpm5MilAJA/9FDMeUjoXh8X17kwW52wP6wjiGu6Rgx6fjbTZ2569ZcBBooyUEdwh8Ey3JnjbnQjGTErxnq8x4Q5vXW5NwL71++TDWVMeww1uVhtjcK473aB09JgM6ZhSIwufh1m6ftrEc8bxFUZtp4yvl4Jk9CHjEZ83pu8TG+9eFdbbvC9B/kT5lg+pQQnR2e7iIfewD9MqUpoXEAXxc57drkXQ4g3ILFfF0nA4tVNLti4emAw1gpF+PlqimAMpPOxVcG15p6JKrsdc5FDRH95wxwFWzZgKwN2ZDq4jceDwhAMj9NZOhtOMqfXQfcCAmt2StBYq+WTFKL90x8tyuRJ7V3pUMUNmJGeLByfNTS5Eqpw18Fhowqp2A2WixK82mCFPt7/Xe3FeNLT4m9dorPNZVih7RYp0EF9P09mUoaeGPxFYwV2IKY156OaGdmTkM131RDM4QzZFMMjVypn+lwaIM2Pk/MT6f6/9idKA4P+jk/H13rt95Z3bGnKoJ2ZNwh0hHqeBMYVZuLIGjRppRf/Io07G0umqrhcKdqLqCF6SHxh5rwvz3x05UPmfJVJyf9B7sgnxQGG2M0+NqTaEEGZQZK2hVSvI597OIrW2kg9ul6rB+aTjNunQa4ThnmGL2ol8+oIB2Kn4OHK0L6MHKChfcNQVnndh3TkmOGkDN78DO8tMg3dpoX/vWpexYSa2PhJ8BXMs8EY+T5MnlDJA8ImGTsbJsJTTL65J/s07EBG5xISJQRkzM7itLW+eN3UTZNxw4jgQrqqe0EBLeeD4KkfAq1UtEq1oiwiTaMfvbyEir1gWEpZ1Zt7oh/3wIxmz2F/PD8Rw==|920 \ No newline at end of file +}//G6wL/STj2jEUghIrr4FkBmJwnvrW6VCL7/ZEUCGs3G59lu3NhfnjFvLHZg2Dm5llqXPKIAyL2GCANa+vSNy8Se8PrHmZ5fjbneR4DW2O7eTbNUUyGpv0UPIFXE+43RurhZy3q5UXuOCCSqvFzZm/MIVZxwLG901j8zD/dVBR7e/sTTSCbY55Hw96VVSRtmSdoPWi9Lr0WP4D5UrNaxMPm7O8KdCTwqh71WJIBq0mKeab/6CC3q4bgcOXWz0RLmpdT0Ol5IJzvpkR70zphxt72LOkGAvh9iMtRwyDjs2vuH4NBmYUXrHmqbaLA8bd5OVIprHA2nn/m/ol8M8rDyDOr10RE5NRaSmXpH2BfgC+bY9VMaxR7AcPd48QkpKtc75SsfkcerAqrxQJd8MTLBVngSSmqa5NXul58lx4kP436UFsGAYn2cgWw2v5UBam8jjK/UuNYXcgWCTXZ6w6l5L/0xoBGXiwM6T87l3xYoKdwPt2XWDSP/AarT6kkQ50ZogKIj/Hgn2tQR109LBfZdUHiAs3dFSxZ1I3ENcxtzA5VNVeEQjLRfc+9QvoetMHKAH+TK0XrnkYhuXWHjFMw47nRgj/EVxaJNqjU9YpHiPpHc826CRL9v7uW3EVCyL0nvJ3JzvpztgZXvJlMhEw4rJweMj10Dky46Kn0+0UewUzSoojGRjK3MPGX69VGgG6Mo9+wE4kopS7oGw17Ua3CJZrlfqyhr2giTD5kkQWoviOxBU56M2nCKpRn0+2uK9Olp8RQggz6vHlesrk1raGzT76YWipQ5/zCsrEPMRKBo4B2docSQYuBprPSuT72CnAaF0K23h12XV3QuJW+CHA5IdGucpkXUBQloYns/U/HY9z82rqw3EjVgQftEm7czLvmfVA4ZDZVIkanFaa+NlqFvUYOA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-Gitee信息.rd b/Pages/个人中心/个人中心-Gitee信息.rd index e718a8f6..b4da964f 100644 --- a/Pages/个人中心/个人中心-Gitee信息.rd +++ b/Pages/个人中心/个人中心-Gitee信息.rd @@ -4,28 +4,12 @@ "RowCount": 9, "CustomNames": [ { - "Name": "姓名", - "Formula": "#REF!" - }, - { - "Name": "邮箱", - "Formula": "#REF!" - }, - { - "Name": "负荷", - "Formula": "#REF!" - }, - { - "Name": "时薪", - "Formula": "#REF!" + "Name": "Git密码", + "Formula": "'个人中心-Gitee信息'!$F$6" }, { "Name": "Git用户名", "Formula": "'个人中心-Gitee信息'!$F$4" - }, - { - "Name": "Git密码", - "Formula": "'个人中心-Gitee信息'!$F$6" } ] } \ No newline at end of file diff --git a/Pages/个人中心/个人中心-三方认证.json b/Pages/个人中心/个人中心-三方认证.json index d20dd5a3..f1c33ad5 100644 --- a/Pages/个人中心/个人中心-三方认证.json +++ b/Pages/个人中心/个人中心-三方认证.json @@ -351,13 +351,13 @@ "BreakpointIdentity": "3b169f84-9d89-492a-af89-c2ed9bd65060" } ], - "ID": "d9c0340b-86bd-4cfc-af02-f964fc807b78" + "ID": "0c8e73e5-3e65-4826-a8d9-bee12fe8f0b7" } ], "BreakpointIdentity": "d9beee9b-335f-47d3-8e5f-2e1c338d5e55" } ], - "ID": "07c3264e-0341-413c-a20c-03258b429e23" + "ID": "d492244d-9187-4de1-bd46-ae031325e0a7" }, { "CommandList": [ @@ -371,13 +371,13 @@ "BreakpointIdentity": "4099f014-ab68-43ba-8402-6ae8d8f04743" } ], - "ID": "4cc90f15-22f9-421e-90f6-7b285a6c25e1" + "ID": "d425580a-8d7a-4461-9314-b1b36f71886c" } ], "BreakpointIdentity": "15609a97-7220-4c68-ba03-72eea3dfb5a8" } ], - "ID": "8abef5f6-767a-4deb-88b8-7de49ee495ff" + "ID": "46640373-c7a8-415a-b84b-309fe86e4ecf" }, { "CommandList": [ @@ -457,7 +457,7 @@ "BreakpointIdentity": "5be67664-22e6-4330-bec2-bcbdba9749a1" } ], - "ID": "29dd2edf-eea2-4c14-a694-e84ad5581959" + "ID": "56bf79f3-291f-438c-99fb-97a70efa2454" }, { "CommandList": [ @@ -471,19 +471,19 @@ "BreakpointIdentity": "321265a7-14c4-4355-bffe-6000b34b098f" } ], - "ID": "f1b53a92-cc03-4c2a-9315-fa83b3e0f9ef" + "ID": "5d59ee12-c71d-4464-b216-e80d82125cb8" } ], "BreakpointIdentity": "90ca5920-eb8e-4e70-a34a-631581137fcd" } ], - "ID": "809a5fd5-674f-4cb2-a14a-98d391396c7e" + "ID": "fc2dc0a9-96e9-49e7-b4e9-bf3f64d966dc" } ], "BreakpointIdentity": "80ad210b-5990-4e06-b64a-9a8b16c01f6a" } ], - "ID": "5961df2e-4c72-4b83-b737-1f0c39b36d27" + "ID": "86debf89-cd27-47c7-aa48-a63b9ebe3911" } ], "BreakpointIdentity": "d25e4b46-72bc-41b1-b8dc-af6ab011bb93" @@ -888,31 +888,5 @@ "Location": "3,30", "Size": "3,18" } - ], - "CustomNames": [ - { - "Name": "姓名", - "Formula": "#REF!" - }, - { - "Name": "邮箱", - "Formula": "#REF!" - }, - { - "Name": "负荷", - "Formula": "#REF!" - }, - { - "Name": "时薪", - "Formula": "#REF!" - }, - { - "Name": "Git用户名", - "Formula": "#REF!" - }, - { - "Name": "Git密码", - "Formula": "#REF!" - } ] -}//TLuSX+HmrmFLJaKZdTR2pUzuArbaBzOANpMiogrbla52BvSXwLGpHQhW3R1rOL6Ujeii4aL8fu38Ml82faRH1TX+Tiz1s/HAjpcj5wMCWcsK7msFPWvLLhkWr9SIM+tLcB8XeZzv9NjC9tcI8NwknE6Fmpl8wdyevdd2WLCq3a6vuf1qvQ9y0kB0OAZsVOzNXB/k2Fw/VCgLyC5eabzEwrltlW9xCbWuCFIwkOKlK2pii7q/bYCPGjMkDRuAsPBg0PrV05at8HIUwgsCKO/P/AOgLd1QgqVt0p8C0vfbdCPbZfWApgVj97hxMiie51mX3Jhrog0fmDY1410hLFDcihoOnmBZDOG7vRGngafez5nU83B7crbN7X3rTefcyx45e9yMOlYv5K7SDSPAfJ7knvXky0frUCChjy5MqNODAngGiLHMnhmjbtTCHtW0mPDJG+nRq0txzGwTh4XdzqvvU0U1kG7Scp1sLECFQHsmE8Kvrqz1I1X9CRfr+XRouWkNeLgrF6/yo3hdVPa01uQaCwceTvwMg+FaA2vH6qQrh8A+5u0EU/YiG9a9vOUsiI+evtxj7eiQjfjuual0w0G0VdOZy7R8Dj82csXmpGIVAVqscu+axCkFX0zIoxU393b5J2Xct5F81nsStQeNzgXo7z29xs5yJaD/SrsurCs0l+rrZTrIGT8lrtp5Ic+UiI9hsVUzbOYVB64XS3infIh8BjO/Lo6XLmuC4hb7kipGCh6EFpfDgV9fCJJdHNBLRTMNFzYz/ci58BVc4y4kv8Phi/5Zm2nrq8BZym6TpsbvJKZ3D+jobzljYByPl14s1RjjXqQso1E/RivmiAzP2mlhsMCB0ii8Y/7UvXw/098KRQfe4LtQMePEwR+6hPXdqBJSIQO+zmm9MxH86Sa/qrjhFQ==|920 \ No newline at end of file +}//Hu+EQPCDGv/ZeClKBww600RXck9q4Nj/Rf1XNs0+Zom1mtNl5qxdOYtJQGnSzhWeNcmAaGhBZYRGkS6DYkl4yIqWewDswCOiSbmYBIEf3JY/B7DY6OSR03Zf7Jm/4DobfHYposNHlxVkqPAS5UfhgtFNhblqYPqvxmO3a/VSF2QY0CXA/xcWxZIgYlalFBU5/B0cjgNQtbhKCbzU6mYjl75RaPmJGOtRxOXEiUUUsah82kGfPBAgsxdL2sNL9eUlo64xerHWJHk9UOUi+W4igA7I+VrTJeDC9gu2NzhHDDIguyNepa5kEZNiVP9KW/1CyAEaRuke5wbptIxP4Wp27W95FqDlGFcVQOYKsVTA34M4HB0Rydh75ZPAYqp4s8XDxKMRIKWRf9YnZMD8S/pB1hUlejgeUJSXG9spBJRnSnq3PvYAdTnCCfKjbOt+fd1HsmpPyEcna2WphdJ07ljg+lNcAefA4Er6ro0hkdfiorq0Vmu/oGn/aKFZTwTsyLil8NrE/R5vjz1EWDarIT5r7Uqt2ppQtcWQN46p8GeA2yz1O8ulZLf9OjAK74NW1Hrtg14GMgfcOQuk2EnC/pFwBdPVgFj7SHCbsxMWJdZy2q8ACQci7wSCxxIPVgd/qriFnfZO4orAqMnJSeEgovYoS0kXPkcswCsZQIi9RcKwSh7AOxpL960n/bK4ONZyaquN7PzdlzSuXJWwfU6ClSW20lBZNRROpG+nvMh/Abxr3ZeSZfBSWYcOGOSN6GqXiDlaJ7Ad6flGH3mnwo2pLEkKqSSUjMrCNcQFzOVBNAsMezYk7EdpkMeOO8BjfWvRdIbtWY71CiLLuauAJg5rDaVAwaI3NmxFrFwdMSADPyFsiXnV8xEuxoGTGXD4Qzob8fZXLPGxjR2r6rRF2w+qBjMlsg==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-三方认证.rd b/Pages/个人中心/个人中心-三方认证.rd index ffdb1113..73b369f3 100644 --- a/Pages/个人中心/个人中心-三方认证.rd +++ b/Pages/个人中心/个人中心-三方认证.rd @@ -4,31 +4,5 @@ "RowCount": 7, "Formulas": { "3,5": "IF(ISBLANK(J4),\"未绑定\",\"已绑定\")" - }, - "CustomNames": [ - { - "Name": "姓名", - "Formula": "#REF!" - }, - { - "Name": "邮箱", - "Formula": "#REF!" - }, - { - "Name": "负荷", - "Formula": "#REF!" - }, - { - "Name": "时薪", - "Formula": "#REF!" - }, - { - "Name": "Git用户名", - "Formula": "#REF!" - }, - { - "Name": "Git密码", - "Formula": "#REF!" - } - ] + } } \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 77fd944e..61744c63 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -337,13 +337,13 @@ "BreakpointIdentity": "6ec3d9f9-b36d-4786-af71-e8f7ef88f686" } ], - "ID": "af989657-1d58-4445-bb9f-99375f7c41c8" + "ID": "e9883b36-df3b-4d8d-ae6b-68d97d0d27f1" } ], "BreakpointIdentity": "30abaa05-d3e2-446f-8b1f-db4fc4fadd78" } ], - "ID": "ca3d7aba-36f9-46fb-8c9a-b30e4dbd46e5" + "ID": "e3754b58-3d32-40d7-ab10-3ee279b2f7c0" } ], "BreakpointIdentity": "98873105-3f5e-4589-b11f-934ab80cf22f" @@ -495,13 +495,13 @@ "BreakpointIdentity": "36e15163-6756-49ad-885f-d28f57450044" } ], - "ID": "7785ad13-7b63-48ae-a251-2d214ab9e2d3" + "ID": "eb2e3bd6-cc1a-49fd-9221-9e51fa82e961" } ], "BreakpointIdentity": "33916194-fe2a-48c1-9f46-1908ead37779" } ], - "ID": "59b1ad4b-db71-47c5-95a9-76362f38d4ad" + "ID": "514b4343-e13e-4f6e-a536-3ffd57d3a1e5" } ], "BreakpointIdentity": "6b22929e-b163-4100-81a3-c59cfbb13125" @@ -684,13 +684,13 @@ "BreakpointIdentity": "142fedb3-ac21-4b97-8d6c-be6d3ae23689" } ], - "ID": "02f14048-bd5e-4624-8461-78388c981fb2" + "ID": "7fad60ad-5129-4490-9246-8cea01858d12" } ], "BreakpointIdentity": "aea38e97-ae1d-427f-9c9c-3dcfba588cc6" } ], - "ID": "7150ac25-82f3-49de-a65d-ac2ed38962b6" + "ID": "c12fc7d4-ace1-41b3-a772-1b03003a9e0a" } ], "BreakpointIdentity": "901c4361-69e7-43eb-b049-d9bee1ec6b2e" @@ -837,13 +837,13 @@ "BreakpointIdentity": "dbd62bfd-b5e0-46fa-9b03-c50512e0fc93" } ], - "ID": "63ac4c7b-4b64-48bd-9d14-c93b3a5ea970" + "ID": "8c2a0fb2-8eb6-4067-b4d6-2704029d6e52" } ], "BreakpointIdentity": "acd523ac-f013-463b-a9f2-8f810fb0a1f3" } ], - "ID": "bcc51671-f876-4be6-b901-337e71298d6c" + "ID": "4437d7cd-b896-4076-a2cf-a978413386c9" } ], "BreakpointIdentity": "5c31d134-e2e4-4252-93cf-8d63145daa4a" @@ -1135,14 +1135,6 @@ } ], "CustomNames": [ - { - "Name": "姓名", - "Formula": "'个人中心-基本信息'!$F$4" - }, - { - "Name": "邮箱", - "Formula": "'个人中心-基本信息'!$Q$4" - }, { "Name": "负荷", "Formula": "'个人中心-基本信息'!$F$6" @@ -1152,12 +1144,12 @@ "Formula": "'个人中心-基本信息'!$Q$6" }, { - "Name": "Git用户名", - "Formula": "#REF!" + "Name": "姓名", + "Formula": "'个人中心-基本信息'!$F$4" }, { - "Name": "Git密码", - "Formula": "#REF!" + "Name": "邮箱", + "Formula": "'个人中心-基本信息'!$Q$4" } ] -}//k21mOP2G8Ha9tfzJiEO2TJd7S+FAsmrBObMamD5B/hphY2N5O6Nx6OfIuK9+pysW43J72xVRj9cBu7m6SuKjr+qM+s3unKHTUQSn7OiPhm2A/ytrfW54VXUHSbPiS/MNCaXKMOYOV7idXBPL4LY3zTNDkJBAl+8/LzAI/JPowmdNyF/x5KpYl0GbsCDmqBZApR+FXsfbR1irkAiQAbrCjR748TfA6rQACDnhAi/iNn/yfvKO/EZ5S4QI/XpAbpYhcKWEyphVwYwSFMjdvabboUPLNkIDeXfU+75VPwxaNjrkqxf3/Bm2CWM8M0B+8YDtXinPKIOpJIlMT7PdKb9/FrsXYe9MLuQw1vImxqFpYM7GsBVJkqOVfhepcF0J6/+dOcD/xRwrIbXlz+uS5TQQPjTOsu7bma//utL9uz+vaJBAq8uA5fNs3DnQM/p05qdbQv4y8dceiASfgOIlvGOf4PqvlkIp9zYF1vNmlJDaVCWNu5zowhAN2r9vpRemYBRbSXWNLFbuTpJM8Bw/RHTs5iX5E8vW8cde6yCRVfU3UW9qvryuGf+Fb/WZNPyrWpM/in1Nhf/516OmNb5LiLowJeKxgd+4b0c913w+hQ5mTCrglUO9q24PzOdq6Tfwl9tcoDxkrk0wuzzEFNFjG66vTz0EJvkXVVQuLCp/cor6F0wIJaWIcyBpdzoZr4qdk54UldOSjdJHDqfZcodr67mSIykj9+r4P7htaZTmvZMFAKHXdyqu7e5xpzM0nngyrdixkdw7W81PooHiN38aHvTYeiJx20+YXuHA6Td+Jcqa38u9b4T47peKYkYFjJpRkDMoAYhgiwt3cflEynuKdkN5NYBnLA/YS9JewH7LcKtccmuHh8YfwIoRUVvD/tKsSFke4VPDu6/iNvpeOMFhTC+RtQ==|920 \ No newline at end of file +}//jiJvx6R2VbKuTd3WtYtgrOUy0aWwdPvALOXOmzYi7c7Z6OzDvv6dl0MT38qBRWA9o9mCW3nlW4G4er4RpkTmLSnW1D/KEjB8fRM+mshnWcfkgU31qXzskDaMhZqn71Rwp2Ndjx7GN1xcYprJGNbiCx478V36FYcsUPAkppV6ejYgJ+tAF6ImtSBY5Eg3wUolKtRsg1mpcFE4HteQiAWKi1R+3rXLFgyaqeKDKX4OD3/TcPVxfcpIGEYOTulILrUrm3BPNSenYesXFJ4/dR4XDRbeUiVdRM15Zy7ugTzBqkkSuyFTiooM20jR9d7aPFwlS92H5RVYt/LmVFEyKbE+2WpK8enfNM9EBTV4r9tcsWSjpg/+OQhiUXoUyljuxNFKjbI15MnzRsXKxIaHaW1uVRIz/Nlo/EP7uUqDo/gOP3ZclPCleNRmonG/JTWRv3qOQv2FiQwiTDrru7mYQWdotM1roA/zb7AnaYIgAZIrfNMQLmgjobFeLhwJjGGtNqJsjwykGQpZ3Xv0/+ZE2WbYoo4ZCtZw/6KDvznlfhu+NfwSu+f0s+U1/tFzDNG8peRcVTSpLmeVsXQGOo4Urlc0cgeGhFqJjbEWqZ8a1h/Re7ppgkMw17IvnibStUMVwqMCwdkXTOKrtaNOoiDz5liqiuQ+Plh7XSgKTOQyqA0fCyXxeWfMiBcRsogaKexibeel8aPCb0gpAQEmD1Z5uys4nGKgIrvIdYTBYDoyhyKih/XX+oJ5RUeB4GUuZGaZu51lHMXD23Goh50tR/GKa0RBiTVWF00bFeqKE17qQp7DkThS52BQ9ND8hfTkO5s+u1EuwdIneNRNg9CZkKEmaV+VyXWbXdn3cbmHPEJmMw8/BKFbXcybiJuIZ3XsFlSDZNRXYrIGW+e4G/PVlVj48ChPqA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index 6f3f3935..4ad37ea2 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -3,14 +3,6 @@ "ColumnCount": 34, "RowCount": 7, "CustomNames": [ - { - "Name": "姓名", - "Formula": "'个人中心-基本信息'!$F$4" - }, - { - "Name": "邮箱", - "Formula": "'个人中心-基本信息'!$Q$4" - }, { "Name": "负荷", "Formula": "'个人中心-基本信息'!$F$6" @@ -20,12 +12,12 @@ "Formula": "'个人中心-基本信息'!$Q$6" }, { - "Name": "Git用户名", - "Formula": "#REF!" + "Name": "姓名", + "Formula": "'个人中心-基本信息'!$F$4" }, { - "Name": "Git密码", - "Formula": "#REF!" + "Name": "邮箱", + "Formula": "'个人中心-基本信息'!$Q$4" } ] } \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 03f14eb5..8faa61b3 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -21,9 +21,14 @@ "DesignLengthInPixel": 32.0 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 18.0 } }, "6": { @@ -33,12 +38,12 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 18.0 } }, "9": { @@ -48,12 +53,12 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 18.0 } }, "12": { @@ -61,46 +66,61 @@ "DesignLengthInPixel": 32.0 } }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 375.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "18": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } }, - "19": { + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 18.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 18.0 + } + }, + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 331.0 + } + }, "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, "InLogicalVisibleIndexes": [ - 20 + 23 ], - "Count": 21, + "Count": 24, "DefaultSize": 32.0 }, "Cols": { @@ -234,7 +254,6 @@ "DefaultSize": 32.0 }, "Values": { - "0,37": "FGC_审批记录", "1,32": "展开", "3,1": "工单编号", "3,10": "项目经理", @@ -249,18 +268,20 @@ "9,19": "关联任务", "12,1": "预计处理工时", "12,15": "一键报工", - "12,19": "下一节点处理人", + "12,19": "工单处理人", "13,1": 1, - "15,1": "解决方案", - "15,19": "反馈内容", - "18,12": "转为任务", - "18,19": "保存", - "20,17": true + "15,1": "计划开始日期", + "15,19": "计划结束日期", + "18,1": "解决方案", + "18,19": "反馈内容", + "21,12": "转为任务", + "21,19": "保存", + "23,17": true }, "Formulas": { - "1,35": "IF(H21,G21,E21)", - "1,32": "IF(R21,\"收起\",\"展开\")", - "20,20": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "1,35": "IF(H24,G24,E24)", + "1,32": "IF(R24,\"收起\",\"展开\")", + "23,20": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "AttachInfos": { "0,37": { @@ -344,11 +365,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!R21" + "SerializeProperty": "=处理反馈工单!R24" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT(处理反馈工单!R21)" + "SerializeProperty": "=NOT(处理反馈工单!R24)" } } ], @@ -370,11 +391,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!H21" + "SerializeProperty": "=处理反馈工单!H24" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT(处理反馈工单!H21)" + "SerializeProperty": "=NOT(处理反馈工单!H24)" } } ], @@ -681,6 +702,16 @@ "clearable": true } }, + "12,4": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "填写预计工时系统会自动增加项目预算", + "Size": 14, + "ImagePath": "Application/125_help_2.svg", + "BuiltIn": true, + "UseCellForeColor": true + } + }, "12,15": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -801,7 +832,7 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!B17" + "SerializeProperty": "=处理反馈工单!B20" }, "TargetCell": { "SerializeProperty": "=新增报工!工作进展" @@ -821,7 +852,7 @@ "BreakpointIdentity": "dd5dfb56-1609-477a-b42e-d791b31f86de" } ], - "ID": "31dd1d4d-b365-444d-9b85-314d9e509734" + "ID": "6e55e9ed-466b-4b4b-b4c7-3c9d893c7770" }, { "CommandList": [ @@ -835,13 +866,13 @@ "BreakpointIdentity": "1947013d-c6db-4bdb-8bbc-1527194baef5" } ], - "ID": "5e1dd9a7-f4f3-44dd-b954-8dad2ea3c6d8" + "ID": "e61d47d4-9554-430c-a15b-b1c08a9fbb2d" } ], "BreakpointIdentity": "85f560e9-2bb8-43fb-8745-53cf07517a5e" } ], - "ID": "cb00a45a-42e6-4759-8f56-787b41c25433" + "ID": "87f082c1-93e0-4d11-a32e-310bed931172" }, { "CommandList": [ @@ -852,13 +883,13 @@ "BreakpointIdentity": "038456c4-8274-4b66-ac61-d1fedc537548" } ], - "ID": "1e28bbf0-cedb-47a6-a15a-26161b84179b" + "ID": "955116fe-7574-474b-a8b1-00d1229413f7" } ], "BreakpointIdentity": "b2ab54a1-2128-4135-8168-91be2f0de957" } ], - "ID": "d2303a5c-9ae9-4905-9804-8d0d01836654" + "ID": "938afe3d-f27e-48d4-8385-5e3e61b476a4" }, { "CommandList": [ @@ -899,13 +930,13 @@ "BreakpointIdentity": "7cc7974d-b682-41fa-bf89-81749c6ef02f" } ], - "ID": "dd42e1ce-4346-46ea-b94e-3d013e9038d8" + "ID": "e5f45de6-f4a4-4e57-98f7-9f959a1824cd" } ], "BreakpointIdentity": "4bfd9b52-39e7-4bcc-bd53-bdbe019890ba" } ], - "ID": "ee1c028f-6310-40e5-bde1-c476a48259d2" + "ID": "b8b84342-a272-45a7-b5d1-6968909c2856" } ], "BreakpointIdentity": "45417697-5dd4-4f98-8b7a-04f0f962c66c" @@ -1032,6 +1063,96 @@ } }, "16,1": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "计划开始时间", + "GUID": "275574da-c3a2-474a-9c9f-faac66553cd0" + }, + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "date", + "placeholder": "请选择", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "prefixIcon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "Application/136_calendar_1.svg", + "BuiltIn": true, + "Color": "#c0c4cc" + }, + "clearable": true, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "16,19": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "计划结束日期", + "GUID": "bbbf437a-89e5-4a5b-ad31-6083f59613cc" + }, + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "date", + "placeholder": "请选择", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "prefixIcon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "Application/136_calendar_1.svg", + "BuiltIn": true, + "Color": "#c0c4cc" + }, + "clearable": true, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "19,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "解决方案", @@ -1065,7 +1186,7 @@ "resize": "none" } }, - "16,19": { + "19,19": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", @@ -1091,7 +1212,7 @@ "ShowToolBars": false } }, - "18,12": { + "21,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1191,7 +1312,7 @@ "BreakpointIdentity": "a4127f7c-5cf9-4377-8e0c-26165974d6d6" } ], - "ID": "3a13fccc-6bf0-4b51-8e69-ecb4329cf675" + "ID": "3d637302-c4c2-427e-88bd-f716d1e5a608" }, { "CommandList": [ @@ -1207,7 +1328,7 @@ "BreakpointIdentity": "63407a1b-5292-49be-9606-7ad4aec87c35" } ], - "ID": "7ca85630-7794-4b14-adb5-f6e98ee9f675" + "ID": "862690e5-bad6-4d74-998d-da08188bcd2a" } ], "BreakpointIdentity": "e3dada0e-65b9-450d-b4f6-c0c182f1c426" @@ -1227,7 +1348,7 @@ "a6fdf064-9d30-4baa-b82c-912116ebdd59" ] }, - "18,19": { + "21,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1254,14 +1375,14 @@ "IconSize": 14.0 } }, - "20,1": { + "23,1": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "项目ID", "GUID": "9d96b455-1882-41f9-8734-b5b453f27abd" } }, - "20,4": { + "23,4": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "Size": 14, @@ -1269,7 +1390,7 @@ "UseCellForeColor": true } }, - "20,6": { + "23,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "Size": 14, @@ -1277,7 +1398,7 @@ "UseCellForeColor": true } }, - "20,7": { + "23,7": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "展开审批历史", @@ -1293,7 +1414,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!H21" + "SerializeProperty": "=处理反馈工单!H24" } } ], @@ -1302,7 +1423,7 @@ ] } }, - "20,11": { + "23,11": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "流程实例ID", @@ -1330,7 +1451,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=处理反馈工单!L21" + "SerializeProperty": "=处理反馈工单!L24" } ] }, @@ -1363,7 +1484,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!L21" + "SerializeProperty": "=处理反馈工单!L24" } }, "BreakpointIdentity": "f7e5efce-ea3e-43a5-9863-5ba6f68fdc81" @@ -1382,7 +1503,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!L21" + "SerializeProperty": "=处理反馈工单!L24" } }, { @@ -1409,7 +1530,7 @@ "BreakpointIdentity": "58ed15dd-c248-4b95-beaa-7e2c1a00fb94" } ], - "ID": "a9e55bee-b84b-4f56-b8a0-2418eb331d13" + "ID": "ca0489d1-40c0-4f93-b992-04ffc390278b" } ], "BreakpointIdentity": "ee097a72-7523-4a1a-aad5-05397331cfb1" @@ -1417,7 +1538,7 @@ ] } }, - "20,17": { + "23,17": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "CellDefaultValue": true, @@ -1430,11 +1551,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!4:18" + "SerializeProperty": "=处理反馈工单!4:21" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理反馈工单!R21" + "SerializeProperty": "=处理反馈工单!R24" } } ], @@ -1443,21 +1564,21 @@ ] } }, - "20,20": { + "23,20": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "ID", "GUID": "06c65a7a-2d90-472d-9cac-7438b2aa1bcc" } }, - "20,24": { + "23,24": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "状态", "GUID": "e36d0800-87af-474f-a6b5-71e1d101362c" } }, - "20,27": { + "23,27": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "报工ID", @@ -1508,6 +1629,11 @@ "FontSize": 14.666666666666666, "Formatter": 6 }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666, + "Foreground": 2 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -1798,7 +1924,7 @@ "12,1": 5, "12,2": 7, "12,3": 7, - "12,4": 7, + "12,4": 9, "12,5": 7, "12,6": 7, "12,7": 7, @@ -1808,7 +1934,7 @@ "12,12": 7, "12,13": 7, "12,14": 7, - "12,15": 9, + "12,15": 10, "12,18": 2, "12,19": 5, "12,20": 2, @@ -1874,7 +2000,7 @@ "14,36": 7, "14,38": 2, "15,0": 2, - "15,1": 10, + "15,1": 5, "15,2": 7, "15,3": 7, "15,4": 7, @@ -1892,7 +2018,7 @@ "15,16": 7, "15,17": 7, "15,18": 2, - "15,19": 11, + "15,19": 5, "15,20": 7, "15,21": 7, "15,22": 7, @@ -1913,95 +2039,182 @@ "15,38": 2, "16,0": 2, "16,1": 7, - "16,19": 2, - "16,20": 2, - "16,21": 2, - "16,23": 2, - "16,24": 2, - "16,25": 2, - "16,26": 2, - "16,27": 2, - "16,28": 2, - "16,29": 2, - "16,31": 2, - "16,32": 2, - "16,33": 2, - "16,34": 2, - "16,35": 2, + "16,18": 2, + "16,19": 7, "16,36": 7, "16,38": 2, - "18,12": 2, - "18,13": 2, - "18,14": 2, - "18,15": 2, - "18,16": 2, - "18,17": 2, + "17,0": 2, + "17,1": 7, + "17,2": 7, + "17,3": 7, + "17,4": 7, + "17,5": 7, + "17,6": 7, + "17,7": 7, + "17,8": 7, + "17,9": 7, + "17,10": 7, + "17,11": 7, + "17,12": 7, + "17,13": 7, + "17,14": 7, + "17,15": 7, + "17,16": 7, + "17,17": 7, + "17,18": 2, + "17,19": 7, + "17,20": 7, + "17,21": 7, + "17,22": 7, + "17,23": 7, + "17,24": 7, + "17,25": 7, + "17,26": 7, + "17,27": 7, + "17,28": 7, + "17,29": 7, + "17,30": 7, + "17,31": 7, + "17,32": 7, + "17,33": 7, + "17,34": 7, + "17,35": 7, + "17,36": 7, + "17,38": 2, + "18,0": 2, + "18,1": 11, + "18,2": 7, + "18,3": 7, + "18,4": 7, + "18,5": 7, + "18,6": 7, + "18,7": 7, + "18,8": 7, + "18,9": 7, + "18,10": 7, + "18,11": 7, + "18,12": 7, + "18,13": 7, + "18,14": 7, + "18,15": 7, + "18,16": 7, + "18,17": 7, "18,18": 2, - "18,19": 2, - "18,20": 2, - "18,21": 2, - "18,22": 2, - "18,23": 2, - "18,24": 2, - "20,4": 0, - "20,5": 0, - "20,6": 0, - "20,11": 12, - "20,17": 2, - "20,18": 2, - "20,19": 2 + "18,19": 12, + "18,20": 7, + "18,21": 7, + "18,22": 7, + "18,23": 7, + "18,24": 7, + "18,25": 7, + "18,26": 7, + "18,27": 7, + "18,28": 7, + "18,29": 7, + "18,30": 7, + "18,31": 7, + "18,32": 7, + "18,33": 7, + "18,34": 7, + "18,35": 7, + "18,36": 7, + "18,38": 2, + "19,0": 2, + "19,1": 7, + "19,19": 2, + "19,20": 2, + "19,21": 2, + "19,23": 2, + "19,24": 2, + "19,25": 2, + "19,26": 2, + "19,27": 2, + "19,28": 2, + "19,29": 2, + "19,31": 2, + "19,32": 2, + "19,33": 2, + "19,34": 2, + "19,35": 2, + "19,36": 7, + "19,38": 2, + "21,12": 2, + "21,13": 2, + "21,14": 2, + "21,15": 2, + "21,16": 2, + "21,17": 2, + "21,18": 2, + "21,19": 2, + "21,20": 2, + "21,21": 2, + "21,22": 2, + "21,23": 2, + "21,24": 2, + "23,4": 0, + "23,5": 0, + "23,6": 0, + "23,11": 13, + "23,17": 2, + "23,18": 2, + "23,19": 2 }, "RowStyles": { - "5": 13, - "6": 13, - "7": 13, - "8": 13, - "9": 13, - "10": 13, - "11": 13, - "12": 13, - "13": 13, - "14": 13, - "15": 13, - "16": 13, - "17": 13, - "18": 13, - "19": 13, - "20": 13 + "5": 14, + "6": 14, + "7": 14, + "8": 14, + "9": 14, + "10": 14, + "11": 14, + "12": 14, + "13": 14, + "14": 14, + "15": 14, + "16": 14, + "17": 14, + "18": 14, + "19": 14, + "20": 14, + "21": 14, + "22": 14, + "23": 14 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "20,1,1,3", + "23,1,1,3", "4,1,1,8", "4,28,1,8", "4,19,1,8", "1,1,1,18", - "0,37,20,1", - "20,7,1,3", - "20,11,1,5", - "20,17,1,3", + "0,37,23,1", + "23,7,1,3", + "23,11,1,5", + "23,17,1,3", "10,10,1,8", "4,10,1,8", "7,1,1,8", "7,10,1,8", "7,19,1,8", "7,28,1,8", - "20,20,1,4", + "23,20,1,4", "1,32,1,3", - "20,24,1,3", + "23,24,1,3", "10,1,1,8", "13,1,1,17", "13,19,1,17", "10,19,1,17", - "16,19,1,17", - "18,19,1,6", - "18,12,1,6", + "19,19,1,17", + "21,19,1,6", + "21,12,1,6", "12,15,1,3", + "19,1,1,17", + "23,27,1,3", "16,1,1,17", - "20,27,1,3" + "16,19,1,17" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2051,7 +2264,7 @@ "BreakpointIdentity": "4892ef7f-fb2d-41ad-90e5-aad95880f3bc" } ], - "ID": "6c5eee67-a63d-455d-89e1-366f35d56a6a" + "ID": "158188fb-ec60-49b8-bd29-e5ae359789f4" } ], "BreakpointIdentity": "b9c1557b-fde8-4a51-aeaf-b87bbfd66cf2" @@ -2116,24 +2329,24 @@ }, "CustomNames": [ { - "Name": "项目ID", - "Formula": "处理反馈工单!$B$21" + "Name": "报工ID", + "Formula": "处理反馈工单!$AB$24" }, { "Name": "流程实例ID", - "Formula": "处理反馈工单!$L$21" + "Formula": "处理反馈工单!$L$24" }, { - "Name": "ID", - "Formula": "处理反馈工单!$U$21" + "Name": "项目ID", + "Formula": "处理反馈工单!$B$24" }, { "Name": "状态", - "Formula": "处理反馈工单!$Y$21" + "Formula": "处理反馈工单!$Y$24" }, { - "Name": "报工ID", - "Formula": "处理反馈工单!$AB$21" + "Name": "ID", + "Formula": "处理反馈工单!$U$24" } ] -}//Jmf/3ewPjsMd27d0ECARRgLYBdA+yMNm8adY6vXNXTvXqSuLu7AcEV74JYm0Tz0r0q2ZSwHHyjmHSUCvWSYp9sPila+7RIfqt1u5+Zs9JTcFAfqajN48cmfNwS8UC+gFIp50yHhNoBk4L7yZ1L+Z8RwDm6YIoQ8/sqRwFmPg3bpDPltsLKvChQPpaHMZuf7KNHE/W4C5FSSBpIMgQ22ddaSWVpKPU3OP5vCdbKLW2bychr//4RCZzESMsQQfxjcO91ZY7BBpsK9WaEppl2pAR8wBeC1gdi0o5Cbktr/b+ImI2QVQwQ6SqgiHwMqe/b/lkLcaxP+L/HrnmNWU6huY6LJOCvplGAoeF1uzPe2T1SoUsdu1YQnJOV5PzRX2ZnCgbop3qqzG5tGFrvIxiNX2kGAj7Atrk5v2Tih0OtlOcgoBYjuG0zQxq2EB1+iq+os+G/MAho1mjWo/S/RwIRH2eXp+l+1Jg7FV94Ig6KHkftHvJzWOHlDvKS39FBz92Typ8Yih1FDTGBKNMN83hgImZPKqPQY6Op0/SThIZVrZ89fu84jEw7D0J361pG782m+AYRO2jRKpQTpd7stqctEZTkJgHuA+vQrCgsW8UOZ5NgigYc4KacvTNrbL/yvCX0V2rfK7q282MOdVt+rfYigI+ace3n/E9jo3wEsL8yTF2Es7Noqbyg1Mb+F7bBKnICxMrIommHcW6vTVSGv1ktZojDbIkKygt5G6VZvgAWl2guv5xbfaUv3KV2JC5uIOOwKg9+ssb6KLNTA+sgn1pclx4NeGg0B16LK7iYDAUCZbvEkhVh2GhRTVyWExu9y8PgimerQbGviaTQPuoU+OOvzHhZZA5h0G2oLm9dQ/K2psPDiFqS2jmnhaKTrFm3FHoL+smxtyf5ujwPI7BhxIYAJq4Q==|920 \ No newline at end of file +}//GfbrVVM26JEKV7nQVpziv3mDBepgqeBKbBZjgP79Nf7XPvTEtsUGdclJ6td+0jq2oLF0e9TnRlQ97EvPlNJMtbUGs5fpbL4sADR7q1x2rUyoMFlD6iLL5JcbYWgvA5DINbD/EkPygf0b9vz9cZd5p5o8MPey5Rx+mPIRXmeSdhWA6h7WYLpqLU37NS+E5loo7i4znFccJHNol/HbdVei9kubMhztew06sQulkdZolv6GNLds1BvMzmEhXIKgWN9aeyKuP5GAI9vTvw8Uwo4xQglPSHQPvRGEC1L88SPXJ+DV5dtWtQbexD+KAMin637J2c2WvcMkO5Q7ytXRUyWVyV+CG0Z4r/mAAAaS1/wtEqmcTyfQbPOaMDgOu4T6mVqo6OtnYxB4xcupYvYzXx/6ILRgkS+NG/FXouJFVfVmXDBDAOPelhXNwj6b7QRvflg56c2ZPY6DdC5TExNnNfbfjlqmL7y0FPRprC5iKUvuNkPlt3LGxLObktwKvsT/2lHvmdPr0PxUubz07/B5g/oQrm8wGfjnav/t7e3CGMy1dRzF5x569D6RYR1xVeazU9vWkrMx9Dn+wEnXDnEGji+elKT6XIR/ummdkQ8CcY28rjwsZW2pVUaamH42XxNu13TZ0G5WF6Vh0N5n0xIYRTEwnNJa2eg0VD5g0Or003kHtwaKFzarSGPSwDZw/v9mMb0xi4E0ByccYZUfOXOLde5crgiD1/2WBgMQLX9juylVoJOQwgnQy2/aCEkX1+X0wn5AWQE/zZmkm8kKKPSp2Fsupqnj52ClZFPqjUck5RITUbu21Wvt12GhR6M1MyBljrmVv6m8qVTlkt/DYMeb2ZJRhnfIL58/iJGs+8+eps46BGbdaSfuKy5ILo8gd9HcxlBx010FBY+tVx0C+94HvCmduA==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index 25df00ed..f1ae0d0c 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -1,32 +1,32 @@ { "PageType": 0, "ColumnCount": 39, - "RowCount": 21, + "RowCount": 24, "Formulas": { - "1,35": "IF(H21,G21,E21)", - "1,32": "IF(R21,\"收起\",\"展开\")", - "20,20": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + "1,35": "IF(H24,G24,E24)", + "1,32": "IF(R24,\"收起\",\"展开\")", + "23,20": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "CustomNames": [ { - "Name": "项目ID", - "Formula": "处理反馈工单!$B$21" + "Name": "报工ID", + "Formula": "处理反馈工单!$AB$24" }, { "Name": "流程实例ID", - "Formula": "处理反馈工单!$L$21" + "Formula": "处理反馈工单!$L$24" }, { - "Name": "ID", - "Formula": "处理反馈工单!$U$21" + "Name": "项目ID", + "Formula": "处理反馈工单!$B$24" }, { "Name": "状态", - "Formula": "处理反馈工单!$Y$21" + "Formula": "处理反馈工单!$Y$24" }, { - "Name": "报工ID", - "Formula": "处理反馈工单!$AB$21" + "Name": "ID", + "Formula": "处理反馈工单!$U$24" } ] } \ No newline at end of file diff --git a/ServerCommands/项目/增加项目及任务预算.json b/ServerCommands/项目/增加项目及任务预算.json index 759bdfe8..fd7b5f7b 100644 --- a/ServerCommands/项目/增加项目及任务预算.json +++ b/ServerCommands/项目/增加项目及任务预算.json @@ -115,7 +115,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "82ece5b5-37da-429c-b530-a3626e4d0996", + "GUID": "773b32aa-d378-4e19-a0f8-0721718d867e", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -126,7 +126,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "e5388efa-1265-4a08-a9f2-fef3ea7c87a8", + "GUID": "5a6696c9-8233-4279-b68a-79a024a0feab", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -137,7 +137,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "d92c6433-c38b-4f85-8e9c-d649edf91855", + "GUID": "b70023a2-61ee-471c-a169-81ee0edd7494", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -148,7 +148,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "6fa5c0dc-3925-4c80-a85f-807460db5a59", + "GUID": "3bb683c5-de4b-45c1-84c3-c0a1b006baee", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -175,7 +175,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "8a97412164bf4b48b0ca51c1ce55b830", + "ID": "7c05692afabb4164be40f5ac2554e5aa", "BreakpointIdentity": "28c4458f-7909-4347-8b7b-1c5a822307f2" }, { @@ -201,207 +201,144 @@ "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "IsolationLevel": 4096, - "CommandList": { - "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "adbe5b16-3f69-4266-b8a8-9fd6d3df05d4" + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.工时分配方式" + } }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } + "value": "4", + "compareType": 1 }, - "UpdateBindingValues": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "a747572a-a34e-470d-b0d3-65c4d4f94c13" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.项目预算工时+增加工时预算" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目表", - "ColumnName": "项目预算费用", - "GUID": "c6592969-d614-4e70-962d-71a2c046f975" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.项目预算费用+增加成本预算" - } - } - ] - }, - "BreakpointIdentity": "8be94417-97b4-4349-b72f-6b002fa131ec" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "2daf0cf1-bc94-45db-9903-5405c8929eb3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "6fa43337-b4b5-4f79-ae88-9709b35f9140" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=变更原因" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "d395c0e6-146c-4ba9-9d6a-53cda68c4575" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=操作人" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目动态", - "ColumnName": "类型", - "GUID": "6b4316a1-9db7-417e-81cb-3236810fd812" - }, - "Value": "5" - } - ] - }, - "BreakpointIdentity": "38ed8d07-ee67-4314-955b-4ff8a9605902" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "value": "%Null%", - "compareType": 1 - }, + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "IsolationLevel": 4096, "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务信息", - "TableValue": { - "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", - "TableName": "任务表", - "TableValueType": 1, - "BindingInfos": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "7aa34e82-3f71-4a66-86fb-60b147f109a7", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "2764c832-9d79-462a-9b4d-0dd2dc200cab" - }, - "ColumnName": "任务预算工时" - } - ] + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "adbe5b16-3f69-4266-b8a8-9fd6d3df05d4" }, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": { - "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", - "$values": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "c7020e1a-caaf-4ec8-b31f-6ca581dbc14b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "202a8ff6-e253-4dce-b713-6e6683ce0ae0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - } - ] - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } }, - "ID": "670a222610d641279d65cd16f6af9567", - "BreakpointIdentity": "27d2ea5d-ede3-4304-ab5f-8655f3fe1b61" + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "7ff66895-3a30-4247-85e9-0a556907956e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目预算工时+增加工时预算" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "b042ac8a-00a2-40ff-9a47-aea19f59e8b2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目预算费用+增加成本预算" + } + } + ] + }, + "BreakpointIdentity": "ab55dd06-35a6-440b-a3ff-e97a0fa7e65a" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "2daf0cf1-bc94-45db-9903-5405c8929eb3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "6fa43337-b4b5-4f79-ae88-9709b35f9140" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=变更原因" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "d395c0e6-146c-4ba9-9d6a-53cda68c4575" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=操作人" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "项目动态", + "ColumnName": "类型", + "GUID": "6b4316a1-9db7-417e-81cb-3236810fd812" + }, + "Value": "5" + } + ] + }, + "BreakpointIdentity": "00809186-bdc5-45ea-a224-10a9a912e547" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -416,7 +353,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息" + "SerializeProperty": "=任务ID" } }, "value": "%Null%", @@ -426,62 +363,335 @@ "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "4e7c4cf1-1459-4bc5-b648-040621e28308" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务信息", + "TableValue": { + "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "f6e39f25-0b72-443c-b46c-515c4ed70930", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "2764c832-9d79-462a-9b4d-0dd2dc200cab" + }, + "ColumnName": "任务预算工时" + } + ] }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "c7020e1a-caaf-4ec8-b31f-6ca581dbc14b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "202a8ff6-e253-4dce-b713-6e6683ce0ae0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + ] + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "UpdateBindingValues": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "ID": "0b4a9a15e3694df7a0b23eec02992134", + "BreakpointIdentity": "2fe532b6-098e-4d6c-8795-2210144bd6a3" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "c440dc26-0fd1-47bb-bbd8-4e48175e8296" + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息" + } + }, + "value": "%Null%", + "compareType": 1 }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务预算工时+增加工时预算" - } + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.工时分配方式" + } + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.工时分配方式" + } + }, + "value": "2" + } + ] + }, + "RelationType": 1 + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "分配任务工时", + "Parameters": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.RequestServerCommandParamBase, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=操作人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=增加工时预算" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=变更原因" + } + } + ] + }, + "ResultErrorCodeTo": { + "$type": "Forguncy.Common.FormulaCellLocation, ServerDesignerCommon", + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "$type": "Forguncy.Common.FormulaCellLocation, ServerDesignerCommon", + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "30bc0445-bdd7-4bcc-ad68-809d0b1b225a" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0", + "compareType": 1 + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, + "BreakpointIdentity": "0a799b6f-263c-4280-ae6c-4932df06a1d6" + } + ] + }, + "ID": "1f949450-f96a-4bf8-a429-95e51ad08b1e" + } + ] + }, + "BreakpointIdentity": "d5717f6d-5732-4231-b895-17ccdbd7cf13" + } + ] + }, + "Comments": "分配到人", + "ID": "a0e1b85f-90cc-4f9a-a944-65b2e24d36ce" + }, + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.工时分配方式" + } + }, + "value": "3" + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "4e7c4cf1-1459-4bc5-b648-040621e28308" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "9f80b266-5a19-48d2-8742-1ab2ec524a00" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时+增加工时预算" + } + } + ] + }, + "BreakpointIdentity": "9d0a80e7-204f-465f-9460-7b56c58f5ea0" + } + ] + }, + "ID": "3d84a333-eae6-4bf7-a931-c360aae5703d" + } + ] + }, + "BreakpointIdentity": "2617215b-4303-4e84-aee9-223d84effe44" + } + ] + }, + "ID": "929ec896-9b23-4926-9664-cb4079b3e0be" } ] }, - "BreakpointIdentity": "b191073f-e824-4201-926a-fa66639b38ad" + "BreakpointIdentity": "84bb1c4b-d82f-49c2-98df-894533dfddb3" } ] }, - "ID": "cb498f67-362f-4da9-86bb-7d392fc51e58" + "ID": "cd647c5d-a27d-4570-aa6f-f151adf44265" } ] }, - "BreakpointIdentity": "2b755cef-e2ec-4e2e-b174-80db9a6cf599" + "BreakpointIdentity": "1ee3f7e5-e403-40c4-88d6-44e96be217af" } ] }, - "ID": "e0502731-5613-47b6-b91d-6b581ea57213" + "BreakpointIdentity": "40e1ed3a-49c2-4d70-8039-a8f710f191f0" } ] }, - "BreakpointIdentity": "b4fe019c-b8e2-4ef7-b920-6e94635c62bd" + "ID": "deb0a5f5-f4ba-478d-a148-4d61d2104148" } ] }, - "BreakpointIdentity": "24ce0626-771c-4dfe-9f6a-c7a01ba0f22f" + "BreakpointIdentity": "191dc087-f987-4d6a-b15b-1b0ef46d3095" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -491,7 +701,7 @@ } ] }, - "ID": "f57caa4e-dd18-4cca-b1ae-e6362e4f7703" + "ID": "74712da7-cc3c-4f60-babd-8912cbc3e30a" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -506,7 +716,7 @@ } ] }, - "ID": "4e33a9e8-5481-44ac-a5f9-078bd85af0ee" + "ID": "408df70e-824b-45ef-b4b3-6d66c3d2dfe9" } ] }, @@ -695,7 +905,7 @@ } ] }, - "ID": "b8af2d1e-272e-4f6a-94ad-5ef6742c13c2" + "ID": "0f35e7fd-28d1-4a2e-bfbf-3fb645a1f94e" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -716,7 +926,7 @@ } ] }, - "ID": "a7f1fff4-aedd-4f65-8902-3682d578556a" + "ID": "d0e3b75d-b11d-4b5c-9a1e-e7bccde98d57" } ] }, diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index 592a394b..119f986f 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -117,6 +117,20 @@ "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": "计划开始时间", + "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" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "datetime",