diff --git a/.collaboration b/.collaboration index 5aa21513..2eea7ad7 100644 --- a/.collaboration +++ b/.collaboration @@ -141,16 +141,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:52:51.0664598+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", @@ -471,16 +462,7 @@ }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:52:32.7806484+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json" - ] + "ModuleType": 1 }, { "ModuleName": "Image/回收站.svg", @@ -605,16 +587,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:52:51.0663877+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -814,129 +787,38 @@ }, { "ModuleName": "Table/项目预算变动表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:45:47.9651951+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目预算变动表.json" - ] - }, - { - "ModuleName": "PCPage/工时增补申请", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:52:51.0660816+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\工时增补申请.json" - ] + "ModuleType": 7 }, { "ModuleName": "Image/时间.svg", "ModuleType": 38 }, - { - "ModuleName": "PCPage/工时增补审批", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:53:02.0301089+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\工时增补审批.json" - ] - }, - { - "ModuleName": "ProcessItem/工时增补申请", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:53:10.8879083+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\工时增补申请.json", - "Process\\工时增补申请.bpmn" - ] - }, { "ModuleName": "ServerCommand/修改增补工时状态", "ModuleType": 15 }, { "ModuleName": "ServerCommand/新增项目工时增补", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:53:10.8880189+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增项目工时增补.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/应用项目增补工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:56:07.7017114+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\应用项目增补工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:52:51.0661+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:53:02.0301268+08:00", "ModuleType": 1 }, { "ModuleName": "ProcessItem/预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T14:53:10.8879099+08:00", "ModuleType": 28 }, { "ModuleName": "Pages/项目首页/预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T15:06:04.9632488+08:00", "ModuleType": 6 } ] \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 0285acab..1c6a920a 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -78,7 +78,7 @@ "Values": { "1,1": "项目信息", "2,1": "项目岗位", - "3,1": "工时增补", + "3,1": "预算申请", "4,1": "归档项目", "5,1": "退出项目", "6,1": "移到回收站", @@ -177,7 +177,7 @@ "PassValueBack": true } ], - "Text": "工时增补", + "Text": "预算申请", "TemplateKey": "链接样式", "Icon": { "Name": "时间.svg", @@ -402,4 +402,4 @@ "Formula": "项目菜单!$B$10" } ] -}//nG/LRcDUaGH9IgVJZCcDccqkL5CpxMHVrs65K3oriEJWx2smu117pcf2xUBaHMrVc2F8ilrFHc/q12/vlkKVonzxzl48njWgQaFGDJMTfH0Dku8fAVANqHeepOieK9Vrjlg2CUGRkjRXkqFFRWrVk9dIRkOxHH7IObn200mTS76oNLq9jqN2vk3J5P3Xhu+6QIEh4Q5m/jn2/p0lWm+fWFsIgDmkN7zxYHMgJqMlgYV19PGjq6LMJJTcTIusg7w3PZ3mrEhL0oAoJ9UGHj49bqsaJWEssQ2Cg2mJUHdYkmvbIrJsVYrbTx1KYBRm1VR+8tLs0TVKJ1eG0DPLkJx5DKrTUJFJoe2saVLRh0hRzVJOxnBgnAFkkgnJP6TpgDDdDoO0dzSN6ADyDdHM7zOzCQ8aX3tMgcdg2bJX7QRAfNaxaBnLuba4Xf0H0Z9QXMhgMOzvIilE7Y5ZwEtYl80RJCzKNoHsUtG7xZQdXKzB11SehXPnmyMl9KdPQqUhpzoN1CpJnsDk997c1NemAu0lQl46oSwGhtKaWS0e06jr3aTttXVFaWMLR58cbR7HjOJSq/hcc7SP5myp4/dsLgE214JVo/lMmOmrS5yuq91qgjLKoQYmWfN2wQ7Dc2Y12tUBHn9LfpxRdDkxGBGwhYIPBPsDwL99y9xS9EIn5r9j32GuE/NivMliM/IFqRXFgyVjlGWx2/X1tZ0MJzf+k1PC5yooPiw/KXbWJNHQ1URCbWn+QEnlXV4iIqNtY9XFrO/f57C/DM4nFFDH496/B02p318LKt+E5IMaKqOGcjL5Qr8jymiIK+dugGt0onK3EPe5e/zUW5RNbbk4h/CNg0BYVgQLY0pg3FBMVNpd1QCo2+4NGY1MBGb7y0a5UXiqKnENxtOJ+1wM8ss62GuQfXrS/A==|920 \ No newline at end of file +}//l9OzDRMtcSn1bRH4wcR7Y+SIYSPd3aLKQss2V1r9hu7K56jo98QrTiL4n0EHr3B6Xe+Zzr7ExeH947RWrdPCA8WYfdvHMSIaWd4YTsyYy4cDDjCFzqKJTs+SifdTcr+jE+NUnU77OhrMmaQ+bTB8yC69GEcKyzB4XT/YUONT1CGChacFr8168aioD8RprLsYf/wsOln3bTAM7tBxKzmFMwggfFwmVJ+m1PMw0xiQxAPoF53AvVtvAu9fjnxRkvk5HgJVVYYh9+AV9ZqpkcFFFai2FgBRyqi1u6bzpNya7+UpUtsedeadvQgeeJIICjfUzwIXtGNW9Pjmo82YQzt1He0PPseLJCpiNjkTUqHHg0+YaVFKS4f74+c3sCG1y517GTnMsStI7VWVj9Hkp1/xJ7nyyEd90MH1YFwu1Pzi99bFOMzmuT9fxQ/2lvQRaXhOIGkR7yVg0Ibw+WzLea/UwkfHaKQfzV0HenUlpf7NFHfh8uLGbMY2oCnMueA++gtxcRH+S6P/FnOrCZ5UThz0MD+zujRdRaSf+tE9KcCoxtU5xI2QRw6nLvermu0VHCy3Br+83aUmQoIUWUZ5gaR1FpbH9lr5vTTfJMrdkiWaid2K9QUlVfJOzgaFJcA2yxygtHIh59RF+BSQBCkuN3JNNvjKgXbDN9AROveRr95B6FRiUiVK3FQqZCub0JvnbqTh/5ao6hT/S5DtbObW6RsESjhT3yx4QRIr9HfFX4SCa6rXC49U6HRMHjXMkH82py0IjDO6fpiNloJZBD+2vEB3ae8B65e2RMatJc6XUWTREscIWbkLseMVH4A4SFhZ45etdA+X/iCQCTDDucmcSjgJB2MiO3qoSofroS2hZEUqSY4ALG9DM1Nh1GFNgd3m2wZeRAVk3+bR9XU+cD2dN8cdQw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/项目信息.json index d81f959b..d0b4083b 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目首页/项目信息.json @@ -832,6 +832,42 @@ "clearable": true } }, + "17,6": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "预算申请", + "LoadBindingDataOption": 1 + } + ], + "ToolTip": "增补工时", + "Size": 14, + "ImagePath": "增加.svg", + "UseCellForeColor": true + } + }, + "17,13": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "预算申请", + "LoadBindingDataOption": 1 + } + ], + "ToolTip": "增补费用", + "Size": 14, + "ImagePath": "增加.svg", + "UseCellForeColor": true + } + }, "17,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -1550,14 +1586,14 @@ "17,3": 0, "17,4": 0, "17,5": 0, - "17,6": 0, + "17,6": 3, "17,7": 0, "17,8": 1, "17,9": 0, "17,10": 0, "17,11": 0, "17,12": 0, - "17,13": 0, + "17,13": 3, "17,14": 0, "17,15": 1, "17,16": 0, @@ -1791,4 +1827,4 @@ "Formula": "项目信息!$B$33" } ] -}//bG8r1ALvwy58lsIdtUOvJWZjRpyvpr5stw/37oHOedC00T7p0p2j7s48hA3pvXZfQSbG9mNEAtaypiZ1MoY1xt5EMuGjiRKsmu9ipRcMPPcMfk6z/UaTHQlFM5TctfsSgqgbPex3QRht5URhV568JF97qUdMBmJWG7vgeLfU48Uu/FD6X0nBusrsA7DoUgxyW94cvRp+j5c/KsVMxRcLfENRysAYSQbqYdDLYI8m49CzAbF7ZOzB1FgTXvO/qGfJ4j/H6fMQCDgifoSRfwnkz/CpR/eW4eKzGbxaRJYn+/JU8DiXvSa2ja+644xEdrz+t+DO9JreFSVaU+U+5ZA+d850yNY8EwQDdoXMSJXCgDa7RWKvjEwizROVIu/oLkuW2Sdnh8Gv1oDwZjc314I+YwGnVZ/dqSFBkfwXjQI49dzkofEhwK/CJJk5r0SsFCyncl+bnenFJ4wDgPfwxYMfRr3ihWJQ/raGLCqLHPApDKBFr0txslokABXy3S6jt5p0DpdLnEuh2U4VxEUqHgGYnYa4VXXA65uq6jlrVKoJc4BoiV/ShTACUoTYmgp+cx1I3X4QGInVZDLNwz3oQlrVmdOBWfyRVUZOOmM4vY3fGep+GGSjnBW59dbiIkcTEJat2YswMLJi0ZhMNSb9JiGXJ8cKFJZhaZNQ+p6DwUzVV3vMLH7b8WHZlf1NWnlsHO3j7mwLQgC253SmPIboxocKbTo/CKJSn+LnwT0oseWduS37XTUTGpn19/3nV0ZoVIf3yLnoAn+yO5HOqHTuIaAoPIhvtMlbFE1KmLfuxTyT9zYCLutavF3fYTe8sGNXpMMSJVMbD0HExI6rHbEPAYOsV2Mh0vPML27tZUvFdNANlJnYj2XaKV4hVGdJM2WcEQBGuWuNxyifn3f0U2/oVHXu3w==|920 \ No newline at end of file +}//GSOpJBzS3FJQwigKgYOGTdMRcPWcXTYNIJdbsdaGRrRN7ENirxMTchW6Aqw2vRFFuoejNu2iZomjWZgEGJBHVqSCJFTeHT0q7LWmTkV4OXKsCkVmL4riGj70Ebv4xKummdxPKXalNqwEmtV+kXWffSdBSdPOn9ARCLtvzeOXkhyyBeEoyVbi9E28JiIwouDVrdGr5byxvSRVhBg5CAQR5oeUvx2fI9I4pXUGPeUN4GsxvSD5+mG2rf08HiYpv9OXRItuLUaSz70OjWdNjWPQta8UA9TqxtB7NJNoZAP0lQpMF9mISFvYX/5PAq1zLW/uvkRTACCy1GJC+P7ONlPVA5BK101QLX0EJANwYxQZF6jbp8tuRXDoLXvjr2UGWVUC0aCUuKfKzUgA3qU13YdOMAlWJTbgP/3fv/OABOrW4JXq2rmH/rsMcdPItnXe0SmuBOdtYFy6EUX7ejxxNveiju8rDhJFTEHuMARXdmHxPqNixwVgO5NowtGCdsCjGwS9LYv0/UQVNI0SQOOVglAbXn4HNdFpBB6F0UaFm5RMzsTUaTZwNyfDi/5n04dgFjXf94PCrcIpPJe42rbVQxr8MY434wSNZRF3OVVT6fY0AnDYtcC4ukcoFl6ipsjlQnmJ242kRpw8Yi/rN8McGDzaWDih7Qiod3TGEMgrZF3OtfGzThJNgAlv5cci/+kMxBixz7rBcpKsvX5a80kCCV9lqt77GzLf2ZlWHjW34WuMLE0miTZeC3+VWHTArrcVsWSCxhI9ZArYLJouNt6N5kxVFy76ACYJIYFq7+ZDYccQtIrhD2cmzYNwzYtLn4I5YRZmtihZIguQ7OdKfKQBFg2eeKwQ7jdi04mtarpUYkUDKqDsXY0IhYJfeqF0qz5iMPMC5mEPtGvks1cRSVimFj/2xg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index 9f960cb3..f5989352 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -505,7 +505,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "1ef45924a6ae491c8639ac3b1a3226cb" + "ID": "7b23b2d64ccf4c9ba4461d0f4923c63a" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -545,7 +545,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "42a062c9-bfde-4f9a-9509-b5b8715610e4" + "ID": "cb017514-838a-4711-88ca-c1cfec9bad87" }, { "Condition": { @@ -566,7 +566,7 @@ "PageName": "项目配置首页" } ], - "ID": "963415ba-58ce-4f66-a2aa-524084b56bf5" + "ID": "034515bf-4928-48c6-b5ff-b3c14f6690de" }, { "Condition": { @@ -579,18 +579,18 @@ } ] }, - "value": "工时增补" + "value": "预算申请" }, "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "DrawerDirection": 3, "ShowDrawerHeader": true, - "PageName": "工时增补申请", + "PageName": "预算申请", "LoadBindingDataOption": 1 } ], - "ID": "31d92cc2-9279-4ac0-b4a9-876777bcb992" + "ID": "9fad376c-2ff9-411c-9647-28a4761b5fab" }, { "Condition": { @@ -615,7 +615,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "删除", - "GUID": "b57ad817-9816-481b-8990-1be9da662f25" + "GUID": "aa3df268-877b-48f9-95a6-a9df66d7279d" }, "Value": "1" } @@ -626,17 +626,17 @@ "Message": "操作完成" } ], - "ID": "a92f4dfd-6bf8-4ba7-9b61-bb4d0ea27c49" + "ID": "1755bbae-92ea-4e3d-8587-6fcd510fcb67" } ] } ], - "ID": "d2024e7e-4de8-45fb-ac38-a6a030cd63d3" + "ID": "c4bb5acf-da46-4778-820d-9f17ad225124" } ] } ], - "ID": "68993374-42f9-40a1-8577-f6ba2186f180" + "ID": "d0940132-cf39-4e9f-ae21-138469848d41" } ] } @@ -760,4 +760,4 @@ "Formula": "项目标题!$O$6" } ] -}//21U1MFYVcul2qlLAyX6M6QElgxR7uT8YpYavfRbS55nTIfCfT89fQAtTbFXyZM2Eqy8RI5+Iat1q9SbMFMjsuWNp2M1KLoNwiVzz26FR5VGA8B6snQ3qMqG8Y3FG5powotJ7r+VLSlmL7p4oGy0HCJMUTLRP+rich5lx+AoP6f6ZyccRN63M3jQ6xkTl9sqvip9WJr2v70IJstgGk759yx61Q2kZG9edzfjVxE4snczBiGRjJ6djBMyIE8tzFsc6tV1CB49ZEzvivSl2kuvDYrna1RHwGa6Bqu5ZtpX/bVoB6g4MM67pqV7TOJAuC9LQxLg7mP9Oz/rVyatZWDf6x+z5jWpyIacnoHJuK01/axWio7X4K+DygFGvoVtIBGDG2r1GhGmCY3de/fbOdDTfVS9iFnXAYrdW7/yfcymzdDxTltv1nYNzD+ZYyK7wZ3hfI6hieRwxNATw/GA2blPvQMoasaP9LuLV2NS5/9IXdiM6g5wVWfw7Nn7j4UhoCNmAI3LZJE0EUqiARYszYDldV7KPc5FV3JJw3vVVYrz0qj5xgrjKXcXGmWbLUQhOR0iEj6CehRm9iH34QFWsIb+hIjVLP8708xBg8vOeAewqkpmjVRA44ETFdLlQO9XTU5I/W48Y9KZN9Eec/XkC9e9yjFV8hY8/ji+W2niNa1UJoDHRVgCkiZZw79y9h9p2eAUYbu5SktXIJibpouWXfapPYWuuNg6PvUx3Jqx37VSUQmA84tT1LYZ/eli2EbtOR8FL8WIoUWgPs7XdmDPty4Ntsmyr0sJZ+mj7lg+uCL8Jlb6UUrx6P3eGQ1kEdk5NUnAXwk2u+1eaoRBLYFAeM+aE9hb3RxSbdQqwraTv/U5MUSd2K5/h7CmgKe+CLd1r+Nnsy3wiKH/eK5ODKKmTsCbSqg==|920 \ No newline at end of file +}//557c1qPl8zPLBvBRG7xR/nqeS55fYVQ16DV+rrAFyiwZA6gv9btlFNcYjV5PEVZbHwBYvFXUo4GLAZ7YFUzfsNQ8/q8dyLtkCfBWZXYephNdgYdFR8Yqda5J9bl4NcYExYIUMjT70mDZRkrjyaABfmZTs4vDlHB82PLRwgjFJvRtezTBEs24V99WM+YdSA9M4sJNq1paHoAhQF+lvti7M4sBN+jkvx3Sj2iX/ZItGgtL4tweTwQhkTjM8muQOSpPwxsyUKAAkIljxoJLFT+FQCk+hQlcLhA71ujDcwVA5idUlGZKJyaQBofUWjQaKcKpOjoTtxZYotzP4Py+MG9chGdLKcq29+yAdn1FjzY3Tk4VGn6wwmX+MGJt30TjLlZyrAAQJTdjfnW7QAN3V2NLOY9KhuEnf1t55CoQMqbwemkLuPZ1Y2KHG2OkUcQcDXF/bn11ZnXc+9glAmP2Nf0wyP3a9Na29Qwv5crl5T72CWzvL3zcbIAUHlncmPJL2tFp1QigFkAYOelU/mrvFCd43pRLMnnQGpjKtFRtTP4gCHEFzM6JTxb6TBnerVa4mDsQnsi8UsfXQ55rmS9gA5BCBxtl81aQB0gS9GEVU19oLDaIDw23Wg19cDHK2iL0e/tM9iTl65Sfe6WbOTnufoop450ssMT/xQ5xKYZnF8KZuSLlMSAM/+oDs9g5KeKMIuf3NJJjezK3+AbfyoATV/QTkzgN51KWS0ZLMyRCrlA45OQvMAgOVNIlY1OrQcWobFZtx+IbXotjrKa3UuaB5oLh6iDg6+X1/XgBwKJ7pjdMZ0xfC45iKqOZzlXJI4G5u/dGYFkFuA4Xzp92Rk3xLCwehOKkfahWDU6AnDeaz7miHetc292MAmCiMiS1Cc7ap0j20ueHoxt4uUa1mcm++EpAOA==|920 \ No newline at end of file diff --git a/Pages/项目首页/工时增补申请.json b/Pages/项目首页/预算申请/预算申请.json similarity index 82% rename from Pages/项目首页/工时增补申请.json rename to Pages/项目首页/预算申请/预算申请.json index b25a31b6..20263be3 100644 --- a/Pages/项目首页/工时增补申请.json +++ b/Pages/项目首页/预算申请/预算申请.json @@ -56,23 +56,28 @@ "DesignLengthInPixel": 35.0 } }, - "15": { + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0, "Mode": 1 } }, - "16": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "17": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } }, - "18": { + "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -82,24 +87,14 @@ "DesignLengthInPixel": 24.0 } }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "14": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 71.0 } } }, - "Count": 19, - "DefaultSize": 32.0 + "Count": 22, + "DefaultSize": 35.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -177,11 +172,12 @@ "1,19": "申请历史", "4,1": "申请人", "7,1": "原预算工时", + "7,9": "原预算费用", "10,1": "申请增补工时", - "11,1": 12, - "13,1": "申请理由", - "17,1": "取消", - "17,13": "提交申请" + "13,1": "申请增补预算", + "16,1": "申请理由", + "20,1": "取消", + "20,13": "提交申请" }, "AttachInfos": { "2,1": { @@ -309,7 +305,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!B3" + "SerializeProperty": "=预算申请!B3" } }, "OrderBySqlCondition": { @@ -416,6 +412,13 @@ "GUID": "8d63ab9f-dc78-45bd-935b-fe8949b56caf" } }, + "8,9": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算费用", + "GUID": "33a4d0df-aeed-4ed2-ba5f-92ae89ef46ab" + } + }, "11,1": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", @@ -434,7 +437,35 @@ ] } ], - "DefaultValue": 12, + "min": "0", + "step": 1, + "placeholder": "请输入(小时)", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 1, + "CompareParamType": 4, + "FirstParamValue": "0" + } + }, + "14,1": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "min": "0", "step": 1, "placeholder": "请输入(元)", @@ -443,11 +474,10 @@ "DataValidationInfo": { "NumberType": 1, "CompareParamType": 4, - "FirstParamValue": "0", - "IgnoreBlank": false + "FirstParamValue": "0" } }, - "14,1": { + "17,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请理由", @@ -484,7 +514,7 @@ "IgnoreBlank": false } }, - "17,1": { + "20,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -496,7 +526,7 @@ "TemplateKey": "_RS_Information3" } }, - "17,13": { + "20,13": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -514,7 +544,7 @@ "ParamName": "项目ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!B3" + "SerializeProperty": "=预算申请!B3" } }, { @@ -522,7 +552,15 @@ "ParamName": "增补时长", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!B12" + "SerializeProperty": "=预算申请!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "增补费用", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!B15" } }, { @@ -530,7 +568,7 @@ "ParamName": "申请人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!B6" + "SerializeProperty": "=预算申请!B6" } }, { @@ -538,7 +576,7 @@ "ParamName": "理由", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!B15" + "SerializeProperty": "=预算申请!B18" } } ], @@ -566,7 +604,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=工时增补申请!code" + "SerializeProperty": "=预算申请!code" } ] }, @@ -582,7 +620,7 @@ "ReloadData": true } ], - "ID": "2fefbcbd-f1cf-4e6c-9fd2-78566c27df19" + "ID": "74184361-980b-4a69-9e85-89108e8d1f7b" }, { "CommandList": [ @@ -592,12 +630,12 @@ "Title": "温馨提示", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时增补申请!msg" + "SerializeProperty": "=预算申请!msg" }, "BtnText": "知道了" } ], - "ID": "130da215-8f39-4001-86bd-21b841012db0" + "ID": "8e7a5c40-c6ab-4535-8411-53d7f569a68e" } ] } @@ -639,6 +677,11 @@ "FontFamily": 2, "FontSize": 13.333333333333332, "Formatter": 4 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Formatter": 5 } ], "Types": { @@ -647,7 +690,8 @@ "Background 2 0", "Body", "[AUTO]General", - "0\"小时\"" + "0\"小时\"", + "¥#,##0_);[Red](¥#,##0)" ], "Borders": [ { @@ -734,19 +778,19 @@ "7,6": 3, "7,7": 3, "7,8": 3, - "7,9": 3, + "7,9": 5, "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": 4, "7,20": 3, "8,0": 3, "8,1": 6, + "8,9": 7, "8,17": 3, "8,18": 4, "8,20": 3, @@ -809,12 +853,66 @@ "13,17": 3, "13,18": 1, "14,1": 3, + "14,2": 3, + "14,3": 3, + "14,4": 3, + "14,5": 3, + "14,6": 3, + "14,7": 3, + "14,8": 3, + "14,9": 3, + "14,10": 3, + "14,11": 3, + "14,12": 3, + "14,13": 3, + "14,14": 3, + "14,15": 3, + "14,16": 3, "14,17": 3, "14,18": 1, + "15,1": 3, + "15,2": 3, + "15,3": 3, + "15,4": 3, + "15,5": 3, + "15,6": 3, + "15,7": 3, + "15,8": 3, + "15,9": 3, + "15,10": 3, + "15,11": 3, + "15,12": 3, + "15,13": 3, + "15,14": 3, + "15,15": 3, + "15,16": 3, "15,17": 3, "15,18": 1, + "16,1": 5, + "16,2": 3, + "16,3": 3, + "16,4": 3, + "16,5": 3, + "16,6": 3, + "16,7": 3, + "16,8": 3, + "16,9": 3, + "16,10": 3, + "16,11": 3, + "16,12": 3, + "16,13": 3, + "16,14": 3, + "16,15": 3, + "16,16": 3, + "16,17": 3, "16,18": 1, - "17,18": 1 + "17,1": 3, + "17,17": 3, + "17,18": 1, + "18,17": 3, + "18,18": 1, + "19,18": 1, + "20,18": 1 }, "SheetStyle": { "FontFamily": 2, @@ -822,14 +920,16 @@ } }, "Spans": [ - "17,13,1,4", - "17,1,1,4", - "2,19,16,1", + "20,13,1,4", + "20,1,1,4", + "2,19,19,1", "2,1,1,16", "5,1,1,16", "11,1,1,16", - "8,1,1,16", - "14,1,2,16" + "17,1,2,16", + "8,1,1,8", + "8,9,1,8", + "14,1,1,16" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -855,4 +955,4 @@ "PaperSize": {}, "Margin": {} } -}//nmdnfu+f3Nsv/bvvzlLJiSXMxXGqS+aJImUQF0F3e5Ne8Ahq6ssRfvBoRQlXW9vHE17VE5ezwp67XSdVPv1il4/ZSVAwp/aIlk771nUIEAJeOcbd1nFgaYCwonDU+Q7znyLzVU3CjF9r0rabjVqXN0vszkAGIFUyXlqAQC/EEjB0qAtEyd3zdGyqeo5WRilynmP1VZvMtJuimNb5TQ9XSROsLBNHg8GOH7EikSC1ObVG+ByXyevUezdNrog87B9XcbLwYCZ9c2KF5KBN0O4/hENd1C/00ZY95lQKi+nZBUZAtLILUw66Z9xmfYFs/C9G3pQpw6lm/QQV0hcpWxTLNQjImddft9T0n3tr8sF0LdsjYGhooLlvL031+ptdNcutrS1n0/zamg7ogjdsY+Uu9dFvX6spUFxDx0cqxuSNw/WQoZqDhHfEQTlkfFMc87xCBM6ucB79qKGSTCOPtCAZ1rTi/MByBwqmgYyoGoEeP6LeYiOaX7H4vqN4fhf7kG+WF3FSIBB0akSvPUZ7PX7HwbVP83isGxdU844UFEYaPI93BJeuhy+G2LHAuYUUIfEBw96yBFMRsKwjagnYGHS/1TnFBdbI/ltSzCxinF5DuVBUfOAeIQabRenLnVnar8GRJm8/+ab8ae36J+UcIlbYeT+3H8/DBI/oS/YrYkfm6s/M9p2TLtPTpsrVfXvSwCXBTnyd8QFsd2NBifA79tsHikZGBX8xLjCPhqzLwAkdcaVVdI3gYhljAFcNCCkvFztYlMdFRcz2Z+3dzj+oWK3vbQ51oQNH0kkxWOcG+PjwEDrefLOZH+jtXAkPXHdO7Tbxd8vNhvSkMeyplFbFSQ1cYj/QfJRdiIFnxsh6GiJ54Q/qI1Oy7lA29s2wgQlcF+2i2crw3SLSbE70L25ssJZAoA==|920 \ No newline at end of file +}//MWfEe0pdQzxIVl0DU7gbKoMX2ErmV4eE99ZDoHKnLMER1f5jujepPOahoLpKJbXB4vutDepGPBsWWo5hIklQPo1FGf61v+gjJepEFu+HBVzPvivxLnGIUIwjdNew6t1P9nrCJjsW9MRGbPez3E6pbo5NmD7ZdxpljhUtfcY+e30x5LI9sMZb04arCjEUQWXGGp0yaEH3D6m6yjH/UvvRRRZ3Jt7kfc4gyr9MgRxs7X9q/+Veoj3O9hIfDMYOMXkyu5gk2DZbzbi7yNYLU5iNsK66xpucFLVVnqdf8ssT1Fj4HEguSE7DBQQ1dCAjMqYJmKfmyYmGHmAShyuzhM13+J317J3IE49EMuxV7Feqjv2p8hi55O/HZbKHndrtLEwANLFSw3TTT1t7wi2s3Lr3BxeNDfn63awrL0msAO87+d/FvByFcH0dYo4KzfZeT9byc0AkdK2+Y5uvXLCSPvpEdfZb0pa5YVgZIknHqUmEnuMl+GSBGkjILryzFg33s9Hsc8zU8mMNo/3ZcUnyocho5wDqf3NAo5vO8rAto9dPQfN+yIqH1gbuwDO0JkQxOh6FnQLRGPAlLqg6oDfW3LSGVhxGBl6BO5BDk8pclj7KfZeDnxflvl6Q5600+EnkDESaUWaF+PzN7w+6bL9/mvq1V02lC7Sz/xst4fqg+ddBaScVr5OCwAqKVq+8wfKsCLU/NbZezDtOdQl7ciibY/k0r6CZoijpXehoqo+UZIEMFe7q5/LFwdM4ZZ3jhglZW3Xb7Xr2nWHtJOkaZAORve7QDKR2+Sxqeq3RR7Fwf7fHjw+Ffg8uv7eU8N3ap7sxXn9nKWnymx7yxxlsn5ESNTS3PNaaL7F5c859yuFPSbEvz9WZeZ/egExs8zIscRBq9nJPclnCeGhiJONVgrAN8FTA2A==|920 \ No newline at end of file diff --git a/Pages/项目首页/工时增补审批.json b/Pages/项目首页/预算申请/预算申请审批.json similarity index 57% rename from Pages/项目首页/工时增补审批.json rename to Pages/项目首页/预算申请/预算申请审批.json index 6d92f0ed..7f984112 100644 --- a/Pages/项目首页/工时增补审批.json +++ b/Pages/项目首页/预算申请/预算申请审批.json @@ -33,17 +33,17 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 25.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 17.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 25.0 } }, "9": { @@ -53,15 +53,25 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 24.0 } }, "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 102.0, "Mode": 2, @@ -73,21 +83,21 @@ } } }, - "13": { + "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "14": { + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, "InLogicalVisibleIndexes": [ - 15 + 17 ], - "Count": 16, + "Count": 18, "DefaultSize": 32.0 }, "Cols": { @@ -119,11 +129,6 @@ "DesignLengthInPixel": 32.0 } }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -134,12 +139,7 @@ "DesignLengthInPixel": 32.0 } }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -149,7 +149,17 @@ "DesignLengthInPixel": 32.0 } }, - "12": { + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -161,32 +171,31 @@ } } }, - "13": { + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "14": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 15, + "Count": 18, "DefaultSize": 32.0 }, "Values": { "1,1": "项目名称", - "1,10": "申请人", - "5,3": "预算工时", - "5,6": "增补工时", - "5,9": "最终工时", - "6,5": "+", - "6,8": "=", - "9,1": "申请理由" - }, - "Formulas": { - "6,9": "D7+G7" + "1,13": "申请人", + "5,3": "预算", + "5,7": "本次申请增补", + "5,11": "最终", + "6,6": "+", + "6,10": "=", + "8,6": "+", + "8,10": "=", + "11,1": "申请理由" }, "AttachInfos": { "2,1": { @@ -201,7 +210,7 @@ } } }, - "2,10": { + "2,13": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请人", @@ -219,21 +228,49 @@ "GUID": "2baf1442-6381-48f2-a5df-46ac4bb8cd29" } }, - "6,6": { + "6,7": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加预算工时", "GUID": "5f8bff8d-6e4d-45b3-8228-49e50f2ecad1" } }, - "12,2": { + "6,11": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加后工时", + "GUID": "259e1581-5d54-40a6-bf01-18d9bbb9e52b" + } + }, + "8,3": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算费用", + "GUID": "0a35797b-fd07-410c-beae-174f0f034377" + } + }, + "8,7": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加费用", + "GUID": "f575847a-57ea-49df-bb5c-94d947e8b721" + } + }, + "8,11": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加后费用", + "GUID": "d1a4d2e4-58cf-4e61-bd6d-09ac2e75baa8" + } + }, + "14,2": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请理由", "GUID": "eb534252-fbb3-44d1-a7a3-1911eacf7ea0" } }, - "15,1": { + "17,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", @@ -277,106 +314,169 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 1, + "Foreground": 4, "Formatter": 2, - "HorizontalAlignment": 4 + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 5 + "HorizontalAlignment": 6 }, { "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, "Formatter": 2, - "HorizontalAlignment": 5 + "HorizontalAlignment": 6 }, { "FontFamily": 0, - "FontSize": 21.333333333333332, - "FontWeight": 6, - "Formatter": 7, - "HorizontalAlignment": 4 + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 1, + "Formatter": 8, + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 24.0, "Foreground": 1, - "HorizontalAlignment": 4 + "HorizontalAlignment": 5 }, { "FontFamily": 0, - "FontSize": 21.333333333333332, - "FontWeight": 6, - "Foreground": 8, - "Formatter": 7, - "HorizontalAlignment": 4 + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 9, + "Formatter": 8, + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 24.0, "Foreground": 1, "Formatter": 2, - "HorizontalAlignment": 4 + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 10, + "Formatter": 8, + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 21.333333333333332, - "FontWeight": 6, + "FontWeight": 7, + "Foreground": 4, + "Formatter": 8, + "HorizontalAlignment": 6 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Formatter": 8, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 4, + "Formatter": 8, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 1, + "Formatter": 11, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, "Foreground": 9, - "Formatter": 7, - "HorizontalAlignment": 4 + "Formatter": 11, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 7, + "Foreground": 10, + "Formatter": 11, + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 21.333333333333332, - "FontWeight": 6, + "FontWeight": 7, + "Formatter": 8, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 21.333333333333332, + "FontWeight": 7, "Foreground": 9, - "Formatter": 7, + "Formatter": 8, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 21.333333333333332, + "FontWeight": 7, + "Foreground": 4, + "Formatter": 8, "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 16.0, - "Formatter": 7, - "HorizontalAlignment": 4 + "Formatter": 8, + "HorizontalAlignment": 5 }, { "FontSize": 24.0, "Foreground": 1, - "HorizontalAlignment": 4 + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 16.0, - "FontWeight": 6, - "Foreground": 8, - "Formatter": 7 + "FontWeight": 7, + "Foreground": 9, + "Formatter": 8 }, { "FontSize": 16.0, - "FontWeight": 6, - "Foreground": 9, - "Formatter": 7, - "HorizontalAlignment": 4 + "FontWeight": 7, + "Foreground": 4, + "Formatter": 8, + "HorizontalAlignment": 5 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "FontWeight": 6, + "FontWeight": 7, "Foreground": 1, "Formatter": 2 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 9, - "Formatter": 10, + "Foreground": 4, + "Formatter": 12, "TextIndent": 10, - "HorizontalAlignment": 5, - "VerticalAlignment": 11, + "HorizontalAlignment": 6, + "VerticalAlignment": 13, "WordWrap": true } ], @@ -386,12 +486,14 @@ "Text 1 50", "[AUTO]General", "Right", + "black", "Center", "Left", "Bold", "0\"h\"", "Accent 2 0", - "black", + "Accent 5 0", + "¥#,##0_);[Red](¥#,##0)", "General", "Top" ] @@ -403,19 +505,22 @@ "1,4": 2, "1,5": 2, "1,6": 2, - "1,10": 3, - "1,14": 2, + "1,7": 2, + "1,8": 2, + "1,13": 3, + "1,17": 2, "2,1": 4, "2,2": 2, "2,3": 2, - "2,4": 2, "2,5": 2, "2,6": 2, - "2,10": 5, - "2,11": 2, - "2,12": 2, - "2,13": 2, + "2,7": 2, + "2,8": 4, + "2,13": 5, "2,14": 2, + "2,15": 2, + "2,16": 2, + "2,17": 2, "3,0": 2, "3,1": 2, "3,2": 2, @@ -426,7 +531,10 @@ "3,7": 2, "3,8": 2, "3,9": 2, - "3,14": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,17": 2, "4,0": 2, "4,1": 2, "4,2": 2, @@ -442,87 +550,91 @@ "4,12": 2, "4,13": 2, "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, "5,0": 2, "5,3": 6, - "5,4": 2, - "5,5": 7, - "5,6": 6, - "5,7": 2, - "5,8": 2, - "5,9": 6, + "5,5": 2, + "5,6": 7, + "5,7": 6, + "5,9": 2, "5,10": 2, - "5,12": 2, - "5,13": 8, + "5,11": 6, + "5,13": 2, + "5,15": 2, + "5,16": 8, "6,0": 2, "6,3": 9, - "6,4": 2, - "6,5": 10, - "6,6": 11, - "6,7": 2, - "6,8": 12, - "6,9": 13, - "6,10": 2, - "6,12": 2, - "6,13": 14, + "6,5": 2, + "6,6": 10, + "6,7": 11, + "6,9": 2, + "6,10": 12, + "6,11": 13, + "6,15": 2, + "6,16": 14, "7,0": 2, - "7,3": 9, - "7,4": 9, - "7,5": 10, - "7,6": 11, + "7,3": 15, + "7,4": 15, + "7,5": 15, + "7,6": 10, "7,7": 11, - "7,8": 12, - "7,9": 13, - "7,10": 13, - "7,12": 2, - "7,13": 14, + "7,8": 11, + "7,9": 11, + "7,10": 12, + "7,11": 16, + "7,12": 16, + "7,13": 16, + "7,15": 2, + "7,16": 14, "8,0": 2, - "8,1": 15, - "8,2": 15, - "8,3": 15, - "8,4": 15, - "8,5": 16, - "8,6": 16, - "8,7": 17, - "8,8": 17, - "8,9": 17, - "8,10": 10, - "8,11": 10, - "8,12": 18, - "8,13": 18, - "8,14": 18, + "8,1": 2, + "8,2": 2, + "8,3": 17, + "8,6": 10, + "8,7": 18, + "8,10": 12, + "8,11": 19, + "8,14": 2, + "8,15": 2, + "8,16": 14, + "8,17": 2, "9,0": 2, - "9,1": 19, - "9,2": 19, - "9,3": 2, - "9,4": 2, - "9,5": 2, - "9,6": 2, - "9,7": 2, - "9,8": 2, - "9,9": 2, - "9,10": 2, - "9,11": 2, - "9,12": 2, - "9,13": 2, - "9,14": 2, + "9,3": 20, + "9,4": 20, + "9,5": 20, + "9,6": 10, + "9,7": 21, + "9,8": 21, + "9,9": 21, + "9,10": 12, + "9,11": 22, + "9,12": 22, + "9,13": 22, + "9,15": 2, + "9,16": 14, "10,0": 2, - "10,1": 0, - "10,2": 0, - "10,3": 2, - "10,4": 2, - "10,5": 2, - "10,6": 2, - "10,7": 2, - "10,8": 2, - "10,9": 2, - "10,10": 2, - "10,11": 2, - "10,12": 2, - "10,13": 2, - "10,14": 2, + "10,1": 23, + "10,2": 23, + "10,3": 23, + "10,4": 23, + "10,5": 23, + "10,6": 24, + "10,7": 24, + "10,8": 24, + "10,9": 25, + "10,10": 25, + "10,11": 25, + "10,12": 25, + "10,13": 10, + "10,14": 10, + "10,15": 26, + "10,16": 26, + "10,17": 26, "11,0": 2, - "11,1": 0, - "11,2": 0, + "11,1": 27, + "11,2": 27, "11,3": 2, "11,4": 2, "11,5": 2, @@ -535,23 +647,65 @@ "11,12": 2, "11,13": 2, "11,14": 2, + "11,15": 2, + "11,16": 2, + "11,17": 2, "12,0": 2, - "12,2": 20, + "12,1": 0, + "12,2": 0, + "12,3": 2, + "12,4": 2, + "12,5": 2, + "12,6": 2, + "12,7": 2, + "12,8": 2, + "12,9": 2, + "12,10": 2, + "12,11": 2, + "12,12": 2, + "12,13": 2, + "12,14": 2, + "12,15": 2, + "12,16": 2, + "12,17": 2, "13,0": 2, - "13,1": 20, - "13,2": 20, - "13,3": 20, - "13,4": 20, - "13,5": 20, - "13,6": 20, - "13,7": 20, - "13,8": 20, - "13,9": 20, - "13,10": 20, - "13,11": 20, - "13,12": 20, - "13,13": 20, - "13,14": 20 + "13,1": 0, + "13,2": 0, + "13,3": 2, + "13,4": 2, + "13,5": 2, + "13,6": 2, + "13,7": 2, + "13,8": 2, + "13,9": 2, + "13,10": 2, + "13,11": 2, + "13,12": 2, + "13,13": 2, + "13,14": 2, + "13,15": 2, + "13,16": 2, + "13,17": 2, + "14,0": 2, + "14,2": 28, + "15,0": 2, + "15,1": 28, + "15,2": 28, + "15,3": 28, + "15,4": 28, + "15,5": 28, + "15,6": 28, + "15,7": 28, + "15,8": 28, + "15,9": 28, + "15,10": 28, + "15,11": 28, + "15,12": 28, + "15,13": 28, + "15,14": 28, + "15,15": 28, + "15,16": 28, + "15,17": 28 }, "SheetStyle": { "FontFamily": 0, @@ -559,17 +713,20 @@ } }, "Spans": [ - "15,1,1,4", - "6,3,1,2", - "5,3,1,2", - "6,6,1,2", - "5,6,1,2", - "5,9,1,2", - "6,9,1,2", - "2,1,1,6", - "2,10,1,4", - "1,10,1,4", - "12,2,1,11" + "17,1,1,5", + "6,3,1,3", + "5,3,1,3", + "6,7,1,3", + "5,7,1,3", + "5,11,1,3", + "2,1,1,7", + "2,13,1,4", + "1,13,1,4", + "14,2,1,14", + "8,3,1,3", + "8,7,1,3", + "8,11,1,3", + "6,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -609,7 +766,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "32,131", - "Size": "382,115" + "Size": "478,147" }, { "Name": "537e7a2e-5d3c-40e9-ac0b-cfb2381a6bea.png", @@ -622,14 +779,14 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "32,304", - "Size": "382,132" + "Location": "32,336", + "Size": "478,132" } ], "CustomNames": [ { "Name": "项目ID", - "Formula": "工时增补审批!$B$16" + "Formula": "预算申请审批!$B$18" } ] -}//Veap5gFpW2WiLCI5RKesYqPxzdYG5YrhOEBdo7vZ/5Ajnt4dMw6XDTSBW0uGkbvufZVYKLd11sGumhjp9WUhnACRGoLaMSXgqT1lEw14ADbgyFsUOKqLoBmElNkS7B/+HfS/dDFJEGCgpPb5c0NtfhZR5UL6Q8kMH8g3qj05FW1p0DT53AqVPxt9mjoRgMEesk6YMoYIBv15X2dH+VFAZlafxdF1sNFk8vu7LUSOYyJAdNfuZDcw96ucjrIQwLRjJFFc9n7oh+BEKDb/meOrvU7dwaS67VzS4VVoGGrrSDbUeY5qxFmt6kRfKo+yPehHPPrFvbTQ4++Z0kqmEKvpbqZGmYIMiumwLdOzS894QOt2zms78WzHmersLYHhMHik+1HywljggAyETNYIAzOlcMy/w2S6K6firyMZv0PD6lmTSI9IVABKkOb9Y+HsTKGLHzleUpIQ8GzHTtPsKy6tYvKR/ZHQFTqdqt9LKzEd6Ahofo0m7irR1pjWZTxSwgSIBXGa7X9pOHlJkYDYaOQ4bGyXdUsPob0ZTcij7TrEGZtSP9XxctqnbA9p19pGgqUMQ9HVqZg+zgxwPi1yC5Z+fBH4UWHr6SwLCzs2lEal3bRWtodFBpzsgY27y5Qa9IYamBLfmff6rBIHYtK86VrPH+1DLsvEvdkmM9DP5yKGe9cyYc3GVRjq2ENJPLXgHmLv7FgiQFQ/Ypau1bRtjCaSJkeluBEtPLXtxSofBTDunnRws6C/cWUVEtmGtPbfddVnouBdptpNE/dWeO1LFttR8/tKYaBqlLMw9Wl3iLzzUKk3yMmhZ5BicWAt+u7VjcYktzPUEpFXBzhT930iWS/Nl3S5nI0PGrVj7YJncMz/EYWqJe0Nk3vnTZjFkpmAMUwQWE6RStn++MsJb4NzsPu2Ow==|920 \ No newline at end of file +}//m7dseABXF/nf6N2SV+KyZSHYrJYYMmxpbBfUBQB6V1bEFhQkYRUGKaD7PXfuiPQ+MPhqNbme+4Y0p74Ihe61dsCQIy8VImC+LM06fCJCZ7/4Jgh8peOIfVFzb0qAJPrbn/1gkWhodhxCIo2uSgIfiOahUsvqcLHQLngDsDpVxofpHN3rgAhrXLZGCaNvTQTeo76kANI0ovp7NFUYPSIiGMq9/a6tmUYt5y+4iOeij5G7DJNh1z2Yb9a0LyvKNyYAWWDFpMpo3Z2e13ABOTeLNBtcPa8fTtpnOd6bjNCkyi0Kq4hJQtjsg5l+c01+4EBCvJlMCUyJd0HfDLrp+sKOPFEFsvv2qHviH7t5KIeTTVxNUt1rVpQiJDXhQFZj8uMmus5MU/BClNH1I56qLjqC0ZU/aFw760lyyEyB1ZvBbutXg4cDYtxyW8+m6fseT87MGZs+2W9XPXsA8cDoJ8gJpVXDKLL4YsRJt1lgJUqvVwLBF2Nukw0/bCJHPBSpUTvmLyRHu+C3qQGvT/DxQuSIFcnIG9rOcBpSM9R+XxdsE59AO9i0spfr0y1dU8vsCkO9rgbyKwyZOR/eAjTSvwdvFZgUDe/V0vHkZ6otz3yMfD31dWJeE2Geib5SqxqqY4Af5PXj2+z6Kui9azGRUXKhdT+CPjhvlg4NvoqW97DmIk6kLcvMOza8E/d7buQQ4cxlYXJaeWbjveSXNPnMeDCcJxgTvZM20Szsv+zJdBB0/k/RV+aLavxNHxwg3mefO74WTL7PCHlG0K5aRmWwhPPHmPazKGODN+xncQKrY4Af+q80yVFTYGdPui3rTjByJnxxib4ikYggw64AUJ+P/nhghkb9P0CR1KcDp3AFTB423T6RLE1q6DbJJvvBpyR67cHdhtpb2EDMIMX4Gtoz8vQSEw==|920 \ No newline at end of file diff --git a/Process/工时增补申请.bpmn b/Process/工时增补申请.bpmn deleted file mode 100644 index b7fc9d70..00000000 --- a/Process/工时增补申请.bpmn +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - Flow_1y1g7g4 - - - - - - Flow_1y1g7g4 - _8c854f9d-40d8-4aed-acb1-6778e09b2e08 - ${nrOfCompletedInstances > 0} - - - - - - _8c854f9d-40d8-4aed-acb1-6778e09b2e08 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn new file mode 100644 index 00000000..ad7ae4af --- /dev/null +++ b/Process/预算申请.bpmn @@ -0,0 +1,69 @@ + + + + + + + + + + + + + Flow_1y1g7g4 + + + + + + Flow_1y1g7g4 + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 + + ${nrOfCompletedInstances > 0} + + + + + + + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Process/工时增补申请.json b/Process/预算申请.json similarity index 87% rename from Process/工时增补申请.json rename to Process/预算申请.json index 6b242960..19e1480b 100644 --- a/Process/工时增补申请.json +++ b/Process/预算申请.json @@ -1,5 +1,5 @@ { - "Name": "工时增补申请", + "Name": "预算申请", "AllowStartRoleList": [], "AllowEditRoleList": [], "PermissionData": { @@ -12,7 +12,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.BpmProcess.BpmProcessPermissionBinding, Forguncy.RbacPermission.Core", "bpmProcessPermissionType": 1, - "resourceName": "工时增补申请", + "resourceName": "预算申请", "roleNames": [ "FGC_LoginUser" ] @@ -20,7 +20,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.BpmProcess.BpmProcessPermissionBinding, Forguncy.RbacPermission.Core", "bpmProcessPermissionType": 2, - "resourceName": "工时增补申请", + "resourceName": "预算申请", "roleNames": [ "FGC_LoginUser" ] diff --git a/ServerCommands/项目/应用项目增补工时.json b/ServerCommands/项目/应用项目增补工时.json index 4eca17d3..a047fb0b 100644 --- a/ServerCommands/项目/应用项目增补工时.json +++ b/ServerCommands/项目/应用项目增补工时.json @@ -42,7 +42,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", - "GUID": "c358a68d-b262-4537-af8a-9fa7fa80c334" + "GUID": "5da894c4-c883-486e-8932-c3c232ec7e18" }, "ColumnName": "项目ID" }, @@ -50,7 +50,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", - "GUID": "30cf2bdb-e5ac-4291-a6a7-d82359931ab9", + "GUID": "5cb5b717-15d5-49d9-a6df-f54bd8b144a8", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -63,7 +63,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请人", - "GUID": "3df8d4d9-a9f9-439b-9380-2ccc41558510", + "GUID": "214bd775-5f76-4f6b-93be-c05d4c0246e2", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 @@ -75,7 +75,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算工时", - "GUID": "bd7157ab-e5e4-48d9-8553-c09cb2f07977" + "GUID": "21b15405-6ee0-4905-8d37-e92aec036a64" }, "ColumnName": "原预算工时" }, @@ -83,17 +83,54 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加预算工时", - "GUID": "bc7899f3-0dda-452b-9454-3b02caae30b4" + "GUID": "7e71029d-77fd-4969-8397-8ac1844c4c6b" }, "ColumnName": "增加预算工时" }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算费用", + "GUID": "ad26dbf9-b1c7-4e05-beea-bf9f871cddad" + }, + "ColumnName": "原预算费用" + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加费用", + "GUID": "61bf736b-f9c7-4c73-89d4-181e0b254c7f" + }, + "ColumnName": "增加费用" + }, { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "状态", - "GUID": "11ba6ee3-3c4f-40ba-a74e-de502508b653" + "GUID": "233c2f41-7339-4ddc-ba7b-e5215c97c59b" }, "ColumnName": "状态" + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "流程实例ID", + "GUID": "0030d8d0-781f-49a1-9423-2f90d99bbb45" + }, + "ColumnName": "流程实例ID" + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "流程实例ID", + "GUID": "18bf2fdf-676b-4461-acb8-a41a8da4ef8d", + "RelationBinding": { + "RelatedTable": "ACT_HI_PROCINST_View", + "RelatedColumn": "ID_", + "DisplayColumn": "DELETE_REASON_" + } + }, + "ColumnName": "结束原因" } ], "SqlCondition": { @@ -101,7 +138,7 @@ "ColumnBindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", - "GUID": "423e1509-3433-462a-9925-c74ef20fb74a" + "GUID": "3d56db16-5b99-4702-8cd1-b3fcc54d6d1b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -110,7 +147,7 @@ }, "TopCount": "1" }, - "ID": "0f3c40a2b6704fd58b6364fbaa26c72f" + "ID": "3f8a6ff80e494e6f8638269f2da384ad" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -129,6 +166,81 @@ "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "审批历史", + "TableValue": { + "TableName": "ACT_HI_COMMENT_View", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "MESSAGE_", + "GUID": "5a67d3c2-151d-42cb-8779-e7582043fa20" + }, + "ColumnName": "备注" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "ac5c1bf7-df32-41fd-994e-496ec9d7d77d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "ACTION_", + "GUID": "299ba4e6-9bb1-46c3-9b19-f1f42eb0c4dd" + }, + "Value": "拒绝", + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "ACTION_", + "GUID": "75857f2e-4e45-470c-819e-e4000608a84e" + }, + "Value": "同意", + "RightBracket": 1 + } + ], + "RelationType": 1 + } + ] + }, + "TopCount": "1", + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "TIME_", + "GUID": "0ed02494-6bb3-4c15-97a7-5d62d8756eb6" + }, + "Order": 1 + } + ] + } + }, + "ID": "2a2d252247be4f2c9f29394e0483d065" + }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", "IsolationLevel": 4096, @@ -143,7 +255,7 @@ "ColumnBindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", - "GUID": "56549cfe-5d2c-40be-9b4e-b37189a7cc09" + "GUID": "e86f50d7-8217-4fc6-8776-b97a79eab9f8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -155,78 +267,125 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "状态", - "GUID": "70c1e56f-b20a-4404-a138-2026373fc13f" - }, - "Value": "已通过" - } - ] - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "6ea0fe03-a28c-4587-8261-e3e3f225f6ba" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.项目ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "e2998a34-b8dc-487e-828a-f88d10845e9c" + "GUID": "b798f803-4150-4646-982a-2684760de783" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.原预算工时+申请表.增加预算工时" + "SerializeProperty": "=申请表.结束原因" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "审批信息", + "GUID": "1e97d34c-e4bf-44fa-869d-68d0ea0a5942" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=审批历史.备注" } } ] }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "0ee6e5e6-124f-43ca-b155-c57301a1bcc1" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.结束原因" + } + }, + "value": "拒绝", + "compareType": 1 }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "a7ce2d71-85a3-45d0-8c81-b291857f059d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.申请人&\"申请增补了\"&申请表.增加预算工时&\"个工时预算\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "eb609cce-274a-437a-956a-611f8e5f4c65" - }, - "Value": "%CurrentUser%" + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "4d24b55f-714e-4669-b5cd-93f37095523c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.项目ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "6439bc2c-dc5f-4101-b7a7-05775feb39d0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.原预算工时+申请表.增加预算工时" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "2c14f476-1f59-4d9f-86b7-f644e48adbae" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.原预算费用+申请表.增加费用" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "ee0d1050-03a7-4b89-ba36-81012da5fc88" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "8f4036f5-847d-47f4-bc9e-6d8891192793" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.申请人&\"申请增补了\"&申请表.增加预算工时&\"个工时预算\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "b78983ed-9348-436f-88ba-1f80ba1a5f50" + }, + "Value": "%CurrentUser%" + } + ] + } + ], + "ID": "4e7e3aa4-4acf-4c9b-8be1-ed0dca3092fb" } ] } @@ -238,7 +397,7 @@ "Message": "应用成功" } ], - "ID": "c538d873-4a71-456b-b7ef-fe41997fa7dc" + "ID": "c4b363ca-3080-443e-8a5c-51d5774b8de5" }, { "CommandList": [ @@ -248,7 +407,7 @@ "Message": "找不到该申请记录" } ], - "ID": "72d41603-3d13-4aac-a6d7-a6b28c79a3dc" + "ID": "70a53f04-ebfb-4ea6-8a25-ad3570adcfb5" } ] } diff --git a/ServerCommands/项目/新增项目工时增补.json b/ServerCommands/项目/新增项目工时增补.json index a5101760..3d364850 100644 --- a/ServerCommands/项目/新增项目工时增补.json +++ b/ServerCommands/项目/新增项目工时增补.json @@ -28,10 +28,10 @@ } }, { - "Name": "增补时长", - "DataValidationInfo": { - "IgnoreBlank": false - } + "Name": "增补时长" + }, + { + "Name": "增补费用" }, { "Name": "申请人" @@ -47,99 +47,89 @@ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目信息", - "TableValue": { - "TableName": "项目表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "233443c9-5006-4869-a441-6cad4abb1286" - }, - "ColumnName": "项目名称" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "f96e6699-9f01-4ba5-89ef-98dafb1120f5" - }, - "ColumnName": "项目预算工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "e5d0c43c-2c1b-472f-afb7-53cd07dd64d4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "e9d3c27e7cac4cc4820ff8d67c25bb77" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=增补时长" + } + }, + "value": "0", + "compareType": 2 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=增补费用" + } + }, + "value": "0", + "compareType": 2 } - }, - "value": "%Null%", - "compareType": 1 + ], + "RelationType": 1 }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否存在申请", + "ParameterName": "项目信息", "TableValue": { - "TableName": "项目预算变动表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "69d303fd-3a6a-474a-b5dc-7eb09f44874f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "77f3f956-399c-44e9-8b9f-4ffd7f550e64" }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "状态", - "GUID": "312f378b-c1be-47fa-a0f8-b1c77d4399d7" - }, - "Value": "审批中" - } - ] + "ColumnName": "项目名称" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "c5e6d17d-3ff2-4cc3-9dc1-1d09225040e0" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "77ccf1a4-3bde-4c83-92dc-aa4146cdfaca" + }, + "ColumnName": "项目预算费用" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "8c9f3e87-4f04-4df8-9e69-c25dbb5d57a4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } }, - "NullFormulaValueQueryPolicy": 0 + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "ID": "01d8aa2100314f4e90279d010dc8219f" + "ID": "43195d529ba847c3a361bde724f62e8b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -151,223 +141,313 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在申请" + "SerializeProperty": "=项目信息" } }, - "value": "0" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目预算变动表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "申请人", - "GUID": "776ec5ab-05d9-4e4b-ac74-eec576f32b80" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请人" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否存在申请", + "TableValue": { + "TableName": "项目预算变动表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "项目ID", + "GUID": "8d9414ec-50fc-4b47-9add-0ced4d957ff4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "状态", + "GUID": "17f93856-652c-4bc5-bb28-3ec9d8e75bc5" + }, + "Value": "审批中" + } + ] }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "a890a01a-72d5-425e-923b-5db9c6b88dfa" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "原预算工时", - "GUID": "841f20bd-e9d5-406d-9400-7750f8c9b3a1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.项目预算工时" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "增加预算工时", - "GUID": "15ae580a-4a57-4173-b2c3-20e3df710e73" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=增补时长" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "申请理由", - "GUID": "fc9add42-cacc-4efc-a55c-0ffd8655b6cf" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=理由" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "状态", - "GUID": "f96e1b72-a646-476b-b640-c71ae1ef214f" - }, - "Value": "待提交" - } - ], - "ParamNameToSaveNewRowValue": "新表" - }, - { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "工时增补申请", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.项目名称&\"申请增补工时\"" + "NullFormulaValueQueryPolicy": 0 }, - "SelectedTable": "项目预算变动表", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "ID", - "GUID": "251e7754-3c92-47eb-861e-dd202a911250" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新表.ID" - } - }, - "Initiator": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请人" - }, - "ReturnResultName": "发起流程结果" + "ID": "f380a95256d64ec69c3ca83b020619f8" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$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.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否存在申请" } - ] + }, + "value": "0" }, "CommandList": [ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "项目预算变动表", + "UpdateType": "add", "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "申请人", + "GUID": "d589f664-6d6b-461a-b8f3-26cf453c854f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请人" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "项目ID", + "GUID": "3087d854-c35b-4517-9674-ddd7e574925b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算工时", + "GUID": "bd9b0543-b5a2-4047-9b44-446fd0c1df4a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=INT(项目信息.项目预算工时)" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加预算工时", + "GUID": "5dd04dc1-d019-4a2b-89b0-63e57d150a06" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=INT(增补时长)" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算费用", + "GUID": "2bed326e-7eae-46db-a777-57132f6d0bca" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=INT(项目信息.项目预算费用)" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加费用", + "GUID": "4875f306-708c-46bd-ac7e-e47bb5b68164" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=INT(增补费用)" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "申请理由", + "GUID": "8ab3518b-bbf4-4b59-9d90-ef7c74deb9f8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=理由" + } + }, + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "状态", + "GUID": "b6ae7a61-2e36-46c0-8cbb-f5b25af20bc8" + }, + "Value": "待提交" + } + ], + "ParamNameToSaveNewRowValue": "新表" + }, + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "预算申请", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目名称&\"预算申请\"" + }, + "SelectedTable": "项目预算变动表", "RowsToUpdate": 1, "RowsToUpdateCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", - "GUID": "6f90ac57-8b74-4c54-aa9a-218ac5c5af72" + "GUID": "13e02fa1-7b77-4b31-92b6-ed337614bd7f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新表.ID" } }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "流程实例ID", - "GUID": "7bba36ed-d6d6-49d1-aa41-9de807a7efcd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.ID" - } - } - ] + "Initiator": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请人" + }, + "ReturnResultName": "发起流程结果" }, { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "申请成功，请等待审批" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目预算变动表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "ID", + "GUID": "c4bc19bd-b0ed-42ab-b8a0-5d732128d1f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新表.ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "流程实例ID", + "GUID": "05011eed-e58c-441d-a1c1-4828158ef0b3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "申请成功，请等待审批" + } + ], + "ID": "4909f1f8-3da3-4a54-a6cc-28c1ce78a14c" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" + } + ], + "ID": "9732d211-79a0-4578-98af-9859de3499f0" + } + ] } ], - "ID": "e5832496-2b9f-438f-b253-807ffdc98bb4" + "ID": "9ceb5305-2d28-40d1-9940-65dcd847e6c9" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" + "Message": "请等待上一条申请结束后，再提交新的申请！" } ], - "ID": "9b364c89-1a17-4e95-bc89-0c5eedbd5d12" + "ID": "ea3a5f27-37f9-4b70-b62b-658dc2fe2839" } ] } ], - "ID": "de088139-3ef2-475b-8b6a-d5709e8f01db" + "ID": "c044fb28-9b46-4bfd-aeaf-39d927df5c61" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "请等待上一条申请结束后，再提交新的申请！" + "Message": "项目不存在" } ], - "ID": "0ae58906-b856-4a9c-8cf4-ad8ee1e71f32" + "ID": "013313f0-b0d1-45d1-9628-fde10321a8f2" } ] } ], - "ID": "45a51cd8-3a1a-424a-8c79-51da306846f1" + "ID": "e7ab3e2f-2332-4f06-bc1b-98c9286c7bc5" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "项目不存在" + "Message": "申请时长或预算不能为0" } ], - "ID": "8fa9acdf-1508-453b-8a43-0ea2d3934021" + "ID": "0d5fb551-5c9e-458a-8c56-5758538c14de" } ] } diff --git a/Tables/项目任务/项目预算变动表.json b/Tables/项目任务/项目预算变动表.json index b281b6ca..d09f6883 100644 --- a/Tables/项目任务/项目预算变动表.json +++ b/Tables/项目任务/项目预算变动表.json @@ -39,6 +39,20 @@ "Name": "增加预算工时", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "原预算费用", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "增加费用", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -62,10 +76,29 @@ }, { "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", - "Formula": "[申请人]&\"申请增补\"&[增加预算工时]&\"小时，项目预算工时合计\"&[原预算工时]+[增加预算工时]&\"小时\"", + "Formula": "[申请人]&\"申请增补\"&[增加预算工时]&\"小时，项目预算工时合计\"&[原预算工时]+[增加预算工时]&\"小时，审批意见：\"&[审批信息]", "Name": "描述", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[原预算费用]+[增加费用]", + "Name": "增加后费用", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[原预算工时]+[增加预算工时]", + "Name": "增加后工时", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "审批信息", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", @@ -108,6 +141,17 @@ "RelationTypeOnDelete": 0, "RelationTypeOnUpdate": 0, "IsDetailTableRelation": true + }, + { + "PrimarySchema": null, + "PrimaryTable": "ACT_HI_PROCINST_View", + "PrimaryColumn": "ID_", + "ForeignSchema": null, + "ForeignTable": "项目预算变动表", + "ForeignColumn": "流程实例ID", + "RelationTypeOnDelete": 0, + "RelationTypeOnUpdate": 0, + "IsDetailTableRelation": true } ] } \ No newline at end of file