From af6d2c1bae3bda1c3da41c87fc5135532b4a9119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 3 Jul 2024 10:21:36 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=96=B0=E5=A2=9E=E4=B8=89?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=A1=A8","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E8=A1=A8"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=89=B9"},{"State":1,"Type":11,"?= =?UTF-8?q?Name":"UserService"},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"},{"Stat?= =?UTF-8?q?e":1,"Type":23,"Name":"TableView/=E4=BB=BB=E5=8A=A1=E5=B9=B3?= =?UTF-8?q?=E8=A1=8C=E8=A7=86=E5=9B=BE"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE"},{"State":1,"Type":27,"?= =?UTF-8?q?Name":"ServerCommandPrivate/=E5=A1=AB=E5=85=85=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE"},{"Stat?= =?UTF-8?q?e":3,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E4=B8=89?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E6=88=90=E5=91=98"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 115 +-- Pages/项目/项目流程页面/创建项目.json | 677 +++++++++++------ Pages/项目/项目流程页面/创建项目.rd | 8 +- Pages/项目/项目流程页面/项目审批.json | 715 ++++++++++++------ Pages/项目/项目流程页面/项目审批.rd | 10 +- Pages/项目/项目首页/项目配置/项目信息.json | 697 +++++++++++------ Pages/项目/项目首页/项目配置/项目信息.rd | 10 +- .../项目首页-容器页面/项目成员/项目三经理成员.json | 387 ++++++++++ .../项目首页-容器页面/项目成员/项目三经理成员.rd | 5 + .../项目首页-容器页面/项目成员/项目成员.json | 205 +++-- .../项目首页-容器页面/项目成员/项目成员.rd | 6 +- ServerCommands/项目/填充项目初始化数据.json | 395 ++++++---- Tables/任务/任务平行视图.json | 40 +- Tables/项目/项目平行视图.json | 84 +- Tables/项目/项目表.json | 17 +- UserServiceDB.sqlite3 | Bin 565248 -> 569344 bytes 16 files changed, 2289 insertions(+), 1082 deletions(-) create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.json create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.rd diff --git a/.collaboration b/.collaboration index e4b86573..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -28,16 +28,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:00:40.8187227+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目成员表", @@ -575,21 +566,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:11:27.0802168+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -629,17 +606,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:02:04.4017739+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -647,17 +614,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:05:44.7327193+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -1441,18 +1398,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T09:56:13.7094997+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1876,16 +1822,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:18:12.1008577+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/任务成员视图", @@ -1893,16 +1830,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:20:22.9897432+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2014,30 +1942,11 @@ }, { "ModuleName": "PCPage/创建项目", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:04:11.8814989+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\创建项目.json", - "Pages\\项目\\项目流程页面\\创建项目.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommandPrivate/填充项目初始化数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T09:58:47.2286812+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\填充项目初始化数据.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/项目表新增事件", @@ -2353,12 +2262,6 @@ }, { "ModuleName": "PCPage/项目三经理成员", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T10:13:00.918444+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/项目/项目流程页面/创建项目.json b/Pages/项目/项目流程页面/创建项目.json index 18b230fd..612a1b6b 100644 --- a/Pages/项目/项目流程页面/创建项目.json +++ b/Pages/项目/项目流程页面/创建项目.json @@ -97,11 +97,6 @@ "DesignLengthInPixel": 35.0 } }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 - } - }, "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -139,7 +134,7 @@ }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 81.0 + "DesignLengthInPixel": 35.0 } }, "28": { @@ -168,6 +163,21 @@ } }, "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 81.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { "GridRowColumnDefinition": { "DesignLengthInPixel": 81.0, "Mode": 2, @@ -179,17 +189,22 @@ } } }, - "35": { + "38": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } } }, "InLogicalVisibleIndexes": [ - 35 + 38 ], - "Count": 36, + "Count": 39, "DefaultSize": 32.0 }, "Cols": { @@ -290,29 +305,31 @@ "14,1": "所属客户", "14,12": "添加", "14,15": "所属客户部门", - "17,1": "管理员", - "17,8": "权限", - "17,15": "分组", - "17,19": "添加", - "18,8": "0", - "18,15": "未分组", - "20,1": "预算工时", - "20,8": "预算金额", - "20,15": "严格模式", - "21,1": "0", - "21,8": "0", - "21,15": true, - "23,1": "工时分配模式", - "23,4": "*提交后不再支持修改！", - "23,8": "如何选择", - "24,1": 4, - "26,1": "项目方案", - "29,1": "预算方案", - "32,1": "网络资源" + "17,1": "项目经理", + "17,8": "商务经理", + "17,15": "客服经理", + "20,1": "分组", + "20,12": "添加", + "20,15": "权限", + "21,1": "未分组", + "21,15": "0", + "23,1": "预算工时", + "23,8": "预算金额", + "23,15": "严格模式", + "24,1": "0", + "24,8": "0", + "24,15": true, + "26,1": "工时分配模式", + "26,4": "*提交后不再支持修改！", + "26,8": "如何选择", + "27,1": 4, + "29,1": "项目方案", + "32,1": "预算方案", + "35,1": "网络资源" }, "Formulas": { - "12,15": "DATEDIF(E36,I36,\"d\")", - "12,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")" + "12,15": "DATEDIF(E39,I39,\"d\")", + "12,1": "TEXT(E39,\"yyyy-mm-dd\")&\",\"&TEXT(I39,\"yyyy-mm-dd\")" }, "AttachInfos": { "1,1": { @@ -378,7 +395,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "9cb723ef-2777-4bd4-b924-11b7bbcd2d56" + "ID": "440ce208-42ef-4490-86fc-3cff97cf09d7" } ] } @@ -673,7 +690,7 @@ ] } ], - "ID": "a8758e5f-3361-4085-8ea0-ff53a09e82d9" + "ID": "e851af8e-4e10-42aa-bdfa-ee399f0f08d2" }, { "CommandList": [ @@ -686,12 +703,12 @@ } } ], - "ID": "09715e94-4c80-4b6a-a2d6-3a7c077d9c33" + "ID": "ffe40eea-a17a-49da-a7b5-0d943386cee7" } ] } ], - "ID": "bd324646-a692-4cd6-b671-b487c967b6f2" + "ID": "8a9e3596-de77-4b4e-b618-2d70ef41cff3" }, { "CommandList": [ @@ -701,7 +718,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "0f459e83-2d24-4575-8bbd-f33d48093b38" + "ID": "0a9ea515-0178-455f-acbe-5ff4e0dea5b0" } ] } @@ -741,7 +758,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=创建项目!E36" + "SerializeProperty": "=创建项目!E39" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -751,7 +768,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=创建项目!I36" + "SerializeProperty": "=创建项目!I39" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -860,7 +877,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "39ee556a-a12e-4d01-86f7-c37bf8bd9a4c" + "ID": "30294211-c4d2-40d8-bc9c-501dd6816a8f" } ] } @@ -1065,7 +1082,7 @@ ] } ], - "ID": "98c42943-ac1a-4db6-9302-7d529d0f2aa5" + "ID": "5a064053-cb9e-42a4-9669-3145eb66c0bf" } ] } @@ -1158,37 +1175,6 @@ "IgnoreBlank": false } }, - "17,19": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=创建项目!P19" - }, - "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ReloadBindingItems" - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "PageName": "项目分组详情", - "LoadBindingDataOption": 2 - } - ], - "Text": "添加", - "ClickMode": 1, - "TemplateKey": "_RS_Main" - } - }, "18,1": { "BindingInfo": { "TableName": "项目表", @@ -1273,6 +1259,11 @@ } }, "18,8": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "2948681d-7b00-40a4-90b7-975742c4b23b" + }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1290,17 +1281,54 @@ ] } ], - "DefaultValue": "0", + "useBinding": true, "options": [ { - "value": "0", - "label": "私有" + "value": "黄金糕", + "label": "黄金糕" }, { - "value": "1", - "label": "公开" + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" } ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "b3ce0cfb-a282-4bef-ba70-3b1f5cb6bca4", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "06e15cee-c7f4-4169-aed2-26cc73c966da" + }, + "ColumnName": "value" + }, + { + "GUID": "801f5475-48a6-4149-b5d2-3787f9b1f858", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "b1d92991-4d31-401d-9397-beb4521f0cf7" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, "placeholder": "请选择", "noDataText": "无数据", "filterInServerOptions": { @@ -1314,6 +1342,120 @@ } }, "18,15": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "cfb4ef54-f83b-4440-9cae-c20363cf188b" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "b3ce0cfb-a282-4bef-ba70-3b1f5cb6bca4", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "5e067d6c-31e2-410d-976c-652e5e7c0c59" + }, + "ColumnName": "value" + }, + { + "GUID": "801f5475-48a6-4149-b5d2-3787f9b1f858", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "81fa6c98-65e2-49a1-bfc0-02595b029c6d" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "20,12": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=创建项目!B22" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ReloadBindingItems" + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "项目分组详情", + "LoadBindingDataOption": 2 + } + ], + "Text": "添加", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + }, + "21,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", @@ -1398,7 +1540,48 @@ }, "DataValidationInfo": {} }, - "20,17": { + "21,15": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "0", + "options": [ + { + "value": "0", + "label": "私有" + }, + { + "value": "1", + "label": "公开" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "23,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1416,7 +1599,7 @@ "UseCellForeColor": true } }, - "21,1": { + "24,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算工时", @@ -1450,12 +1633,12 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(INT(创建项目!P22)=0,创建项目!B22>0),1,0)" + "SerializeProperty": "=IF(OR(INT(创建项目!P25)=0,创建项目!B25>0),1,0)" }, "ErrorMessage": "开启严格模式下，预算工时必须大于0" } }, - "21,8": { + "24,8": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算费用", @@ -1489,12 +1672,12 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(INT(创建项目!B22)=0,创建项目!I22>0),1,0)" + "SerializeProperty": "=IF(OR(INT(创建项目!B25)=0,创建项目!I25>0),1,0)" }, "ErrorMessage": "开启严格模式下，预算工时必须大于0" } }, - "21,15": { + "24,15": { "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", @@ -1511,7 +1694,7 @@ "IgnoreBlank": false } }, - "23,8": { + "26,8": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1537,7 +1720,7 @@ "IconSize": 12.0 } }, - "24,1": { + "27,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "工时分配方式", @@ -1573,7 +1756,7 @@ "b3509007-6037-4c0f-bd29-f876e575ed43" ] }, - "27,1": { + "30,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目方案", @@ -1608,7 +1791,7 @@ "IsSmallButtonMode": true } }, - "30,1": { + "33,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "预算方案", @@ -1643,7 +1826,7 @@ "IsSmallButtonMode": true } }, - "33,1": { + "36,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "网络资源", @@ -1657,21 +1840,21 @@ }, "DataValidationInfo": {} }, - "35,1": { + "38,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "a62b70ea-c851-4cb5-8a98-8141b59bcb4a" } }, - "35,4": { + "38,4": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划开始日期", "GUID": "2e06677b-8d30-4d93-8ee1-8e84f3002e06" } }, - "35,8": { + "38,8": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划完成日期", @@ -1972,140 +2155,104 @@ "15,25": 3, "15,27": 0, "16,25": 2, - "17,0": 0, "17,1": 4, "17,2": 0, "17,3": 0, "17,4": 0, "17,5": 0, "17,6": 0, - "17,7": 0, "17,8": 4, "17,9": 0, "17,10": 0, "17,11": 0, "17,12": 0, "17,13": 0, - "17,14": 0, - "17,15": 0, + "17,15": 4, "17,16": 0, "17,17": 0, "17,18": 0, - "17,19": 7, + "17,19": 0, "17,20": 0, - "17,21": 7, - "17,22": 7, - "17,23": 7, - "17,24": 7, - "17,25": 8, - "17,27": 0, - "18,0": 0, + "17,25": 2, "18,1": 0, + "18,2": 0, + "18,3": 0, + "18,4": 0, + "18,5": 0, + "18,6": 0, "18,8": 0, - "18,9": 0, - "18,10": 0, - "18,11": 0, - "18,12": 0, - "18,13": 0, - "18,14": 0, "18,15": 0, - "18,25": 3, - "18,27": 0, + "18,25": 2, "19,25": 2, - "20,1": 4, + "20,0": 0, + "20,1": 0, "20,2": 0, "20,3": 0, "20,4": 0, - "20,5": 0, - "20,6": 9, - "20,7": 0, - "20,8": 4, - "20,9": 0, - "20,10": 0, - "20,11": 0, - "20,12": 0, - "20,13": 9, + "20,7": 7, + "20,8": 7, + "20,9": 7, + "20,10": 7, + "20,12": 7, + "20,13": 0, "20,14": 0, "20,15": 4, "20,16": 0, - "20,17": 9, + "20,17": 0, "20,18": 0, "20,19": 0, "20,20": 0, - "20,21": 0, - "20,22": 0, - "20,23": 0, - "20,24": 0, - "20,25": 3, + "20,25": 8, "20,27": 0, + "21,0": 0, "21,1": 0, - "21,2": 0, - "21,3": 0, - "21,4": 0, - "21,5": 0, - "21,6": 0, - "21,7": 0, - "21,8": 0, - "21,9": 0, - "21,10": 0, - "21,11": 0, - "21,12": 0, - "21,13": 0, "21,14": 0, "21,15": 0, "21,25": 3, "21,27": 0, - "22,0": 0, - "22,1": 0, - "22,2": 0, - "22,3": 0, - "22,4": 0, - "22,5": 0, - "22,6": 0, - "22,7": 0, - "22,8": 0, - "22,9": 0, - "22,10": 0, - "22,11": 0, - "22,12": 0, - "22,13": 0, - "22,14": 0, - "22,15": 0, - "22,16": 0, - "22,17": 0, - "22,18": 0, - "22,19": 0, - "22,20": 0, - "22,21": 0, - "22,22": 0, - "22,23": 0, - "22,24": 0, - "22,25": 3, - "22,27": 0, - "23,0": 0, - "23,1": 0, + "22,25": 2, + "23,1": 4, "23,2": 0, "23,3": 0, - "23,4": 10, + "23,4": 0, "23,5": 0, - "23,6": 0, + "23,6": 9, "23,7": 0, - "23,8": 11, + "23,8": 4, "23,9": 0, "23,10": 0, "23,11": 0, "23,12": 0, - "23,13": 0, + "23,13": 9, "23,14": 0, - "23,15": 0, + "23,15": 4, "23,16": 0, + "23,17": 9, "23,18": 0, "23,19": 0, - "23,25": 2, + "23,20": 0, + "23,21": 0, + "23,22": 0, + "23,23": 0, + "23,24": 0, + "23,25": 3, "23,27": 0, - "24,0": 0, "24,1": 0, - "24,25": 12, + "24,2": 0, + "24,3": 0, + "24,4": 0, + "24,5": 0, + "24,6": 0, + "24,7": 0, + "24,8": 0, + "24,9": 0, + "24,10": 0, + "24,11": 0, + "24,12": 0, + "24,13": 0, + "24,14": 0, + "24,15": 0, + "24,25": 3, "24,27": 0, "25,0": 0, "25,1": 0, @@ -2135,14 +2282,14 @@ "25,25": 3, "25,27": 0, "26,0": 0, - "26,1": 4, + "26,1": 0, "26,2": 0, "26,3": 0, - "26,4": 0, + "26,4": 10, "26,5": 0, "26,6": 0, "26,7": 0, - "26,8": 0, + "26,8": 11, "26,9": 0, "26,10": 0, "26,11": 0, @@ -2151,18 +2298,41 @@ "26,14": 0, "26,15": 0, "26,16": 0, - "26,17": 0, "26,18": 0, "26,19": 0, - "26,20": 0, - "26,21": 0, - "26,22": 0, - "26,23": 0, - "26,24": 0, - "26,25": 3, + "26,25": 2, "26,27": 0, - "27,25": 2, - "28,25": 2, + "27,0": 0, + "27,1": 0, + "27,25": 12, + "27,27": 0, + "28,0": 0, + "28,1": 0, + "28,2": 0, + "28,3": 0, + "28,4": 0, + "28,5": 0, + "28,6": 0, + "28,7": 0, + "28,8": 0, + "28,9": 0, + "28,10": 0, + "28,11": 0, + "28,12": 0, + "28,13": 0, + "28,14": 0, + "28,15": 0, + "28,16": 0, + "28,17": 0, + "28,18": 0, + "28,19": 0, + "28,20": 0, + "28,21": 0, + "28,22": 0, + "28,23": 0, + "28,24": 0, + "28,25": 3, + "28,27": 0, "29,0": 0, "29,1": 4, "29,2": 0, @@ -2190,37 +2360,8 @@ "29,24": 0, "29,25": 3, "29,27": 0, - "30,0": 0, - "30,1": 0, - "30,25": 3, - "30,27": 0, - "31,0": 0, - "31,1": 0, - "31,2": 0, - "31,3": 0, - "31,4": 0, - "31,5": 0, - "31,6": 0, - "31,7": 0, - "31,8": 0, - "31,9": 0, - "31,10": 0, - "31,11": 0, - "31,12": 0, - "31,13": 0, - "31,14": 0, - "31,15": 0, - "31,16": 0, - "31,17": 0, - "31,18": 0, - "31,19": 0, - "31,20": 0, - "31,21": 0, - "31,22": 0, - "31,23": 0, - "31,24": 0, - "31,25": 3, - "31,27": 0, + "30,25": 2, + "31,25": 2, "32,0": 0, "32,1": 4, "32,2": 0, @@ -2249,9 +2390,27 @@ "32,25": 3, "32,27": 0, "33,0": 0, - "33,1": 13, - "33,25": 14, + "33,1": 0, + "33,25": 3, "33,27": 0, + "34,0": 0, + "34,1": 0, + "34,2": 0, + "34,3": 0, + "34,4": 0, + "34,5": 0, + "34,6": 0, + "34,7": 0, + "34,8": 0, + "34,9": 0, + "34,10": 0, + "34,11": 0, + "34,12": 0, + "34,13": 0, + "34,14": 0, + "34,15": 0, + "34,16": 0, + "34,17": 0, "34,18": 0, "34,19": 0, "34,20": 0, @@ -2259,11 +2418,51 @@ "34,22": 0, "34,23": 0, "34,24": 0, - "34,25": 0, - "34,26": 0, + "34,25": 3, + "34,27": 0, + "35,0": 0, + "35,1": 4, + "35,2": 0, + "35,3": 0, + "35,4": 0, + "35,5": 0, + "35,6": 0, + "35,7": 0, + "35,8": 0, + "35,9": 0, + "35,10": 0, + "35,11": 0, "35,12": 0, "35,13": 0, - "35,14": 0 + "35,14": 0, + "35,15": 0, + "35,16": 0, + "35,17": 0, + "35,18": 0, + "35,19": 0, + "35,20": 0, + "35,21": 0, + "35,22": 0, + "35,23": 0, + "35,24": 0, + "35,25": 3, + "35,27": 0, + "36,0": 0, + "36,1": 13, + "36,25": 14, + "36,27": 0, + "37,18": 0, + "37,19": 0, + "37,20": 0, + "37,21": 0, + "37,22": 0, + "37,23": 0, + "37,24": 0, + "37,25": 0, + "37,26": 0, + "38,12": 0, + "38,13": 0, + "38,14": 0 }, "SheetStyle": { "FontFamily": 0, @@ -2271,33 +2470,35 @@ } }, "Spans": [ - "18,1,1,6", - "18,8,1,6", - "21,1,1,6", - "21,8,1,6", + "24,1,1,6", + "24,8,1,6", "15,1,1,13", "4,1,4,4", - "35,1,1,3", - "35,4,1,4", - "35,8,1,4", + "38,1,1,3", + "38,4,1,4", + "38,8,1,4", "12,1,1,13", "4,6,1,9", "14,12,1,2", - "17,19,1,2", "9,1,1,4", - "3,26,31,1", + "3,26,34,1", "1,1,1,26", "15,15,1,10", - "18,15,1,10", "12,15,1,10", "7,6,3,19", "4,16,1,9", - "21,15,1,10", - "24,1,1,24", - "23,8,1,3", + "24,15,1,10", "27,1,1,24", + "26,8,1,3", "30,1,1,24", - "33,1,1,24" + "33,1,1,24", + "36,1,1,24", + "18,1,1,6", + "21,1,1,13", + "20,12,1,2", + "21,15,1,10", + "18,8,1,6", + "18,15,1,10" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2346,7 +2547,7 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "创建项目!$B$36" + "Formula": "创建项目!$B$39" } ] -}//1N5qTfAh/XYGQyr3tUlvvzrfh+qyy6hptJc+6xocf2JrIj2QMHcvQKoq2NIVssgUi+kHGbPT1UrDTW39vKON/lGeh0yprjQXZfEhnJsxHyo6kYAOz8u774olb+wrBtFn1L7Lm/pNhCu5WhdsiZA5X20dF8JAJaeV/JNJ/roEcUTDrG0aBJMIyObjMifSMyxBlNH/htQEQqTR5siVKhYPHtnsCZLhHarmI/R89lI6sz0WhrgRGhH1a73ATDeZzSr7xHtooh5/G9yj9NTUEUO4DpKJxVrEWUBpLAAWOdRMzsf4whZGyF1BWASU9TgXFw7nuNSjgk8tRgs+fE+oCCpqJ2YAhVeQihEeQ2h2Cf/AMt18RgJLWdfFpRfGCjMdd4Eb5fotIYVdSz0v9X72tL5T0f7UHcea3FepShdVdqbE7cCJjMGboXr+9h5w8l3r9LvPCF1nJTod62Phxxdah7Y8Gqesq4EHRfxtaz2VFM1ucjafTNmCl4tOaaIwdiQ6stsrdH6LP83l043bjB1997yDLOLtEZCEbcnjKMTvrG/iuaK/M3GvFdmdQyAHRIqiUdbc6TArtPcBDwSRgoq7cZDmQn+1C02nwh8ATjS1xIW+LG0wjHGCouwqP/mAa4Mhxj/B+CD0mCiiIkPkF07tjqwnHwB1tdhuP1i+Jon+NS7S+xA9uSUGa2dgvAJeyAKQ03LObQdCekE6/Y8tR6quoKQUyKx1MMRd38MOyghT4rmc/7zstOpHdyog/cVlygMmo9HSxQTv4vXCXoE2ILigzlUCEOyRNjdlfO6vsRN+lyarzzLXrfCM0ibEormBTi4YdvVQX4C3d5hehUmqeHAKgBWsAwZBt5/k59eY0/6d4Kexjf20FX59TRSavo+4JXcJloyWwzM3VV8y59Kurc4GQFI4BA==|920 \ No newline at end of file +}//eYyhn8IvU3AGT6EBAc35yBlkxBu40yUFfM9ikW3G8g6afN1QKKwf80VcOnqKVBYaJBPnosZLraP4BIsi1nz39U8lDB5yMrQVA+KYqCWDMrBgSedY4R+furJ6CRmmMiZVzuxKzBxYude9NxphmHnfoO4xYGFDYRSQR/9Qlh+NK/nFi9NcsU8Sp3RBaJMFHiZ5XCf61bvBt8gXPRKQzcJNnKwD+YxKypg9++7XXXa1UNoLaJKD5VcimnJikJEfDpfwvcBCLe4Oz1a635ZohfGmVK8U0uIClQ1peaQzmGkq5I1zJdroUI0RINI9WSoXAhhHBxMHvif2Exj+V5/gTGEZMNvrlOcox+ZIGVeO64Spxr4Kyc7SiYjJa66lZaZgoexq3tGNSrf+TkWEF+nxWHcnPUhRvx8aRMvbplUwrA6s+lAFRJs5rw52/7lihZucOW0SrNxgl3X9gfCRqIeEefx3e+NzdQ2W6WW8dtNZ8CYjMAfWmKB3I7ulApC/jAHweLginNmMK70GdtwcNcfwuvIlgoJ5QTHk2stMM6XlLtulGtlosB0NuE9rrCkZLdM7B/vhmcvm8ri+5CcN3TwQUurM7uTQeI4bbWoJQ+mx5YPFu5b+Kh3ofE+jNYjFy1TJHLXBkRwtZ35ZusyO13FPLNd+ZTjw5h2f3qUH+In4zpFv2aoq4C59P+6XUnGLcejrIhKds0FOQzjQVdrsQplQ+vCi94Ayj/PtfJjb4ukyKfZpIqW9vSX4uec+t8Cv1z9iFehu/Hfz14hAx5nLxOuTuK135PSH+i78zsSWZKrPCrX4+fwnh3dRY9hNLSDBJjvXkQJh1WVnXipbIts2D4HCOi/E0p32ZXNcE2IPsjvHaLnHY1/PiO8DqOZqm8rV2jcnwB1JdTIiBkS4x4T+m7i551OgWQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/创建项目.rd b/Pages/项目/项目流程页面/创建项目.rd index b659b9d8..4cc448d5 100644 --- a/Pages/项目/项目流程页面/创建项目.rd +++ b/Pages/项目/项目流程页面/创建项目.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 28, - "RowCount": 36, + "RowCount": 39, "Formulas": { - "12,15": "DATEDIF(E36,I36,\"d\")", - "12,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")" + "12,15": "DATEDIF(E39,I39,\"d\")", + "12,1": "TEXT(E39,\"yyyy-mm-dd\")&\",\"&TEXT(I39,\"yyyy-mm-dd\")" }, "CustomNames": [ { "Name": "项目ID", - "Formula": "创建项目!$B$36" + "Formula": "创建项目!$B$39" } ] } \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 925cfec0..a2ea3640 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -36,11 +36,6 @@ "DesignLengthInPixel": 35.0 } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 @@ -78,40 +73,55 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 136.0 + "DesignLengthInPixel": 24.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 136.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 136.0 + "DesignLengthInPixel": 24.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 136.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } } }, "InLogicalVisibleIndexes": [ - 20 + 22 ], - "Count": 21, + "Count": 23, "DefaultSize": 35.0 }, "Cols": { @@ -304,26 +314,33 @@ "0,35": "FGC_审批记录", "6,1": "项目经理：", "6,5": "%CurrentUser.UserName%", - "6,12": "项目分组：", - "6,23": "管理模式：", - "6,27": false, - "8,1": "客户名称：", - "8,12": "客户部门：", - "8,23": "客户联系人：", - "10,1": "预算工时(小时)：", - "10,12": "预算费用(元)：", - "10,23": "工时分配方式：", - "12,1": "计划开始日期：", - "12,12": "计划完成日期：", - "12,23": "计划工期(天)：", - "12,27": "=DATEDIF(F12,Q12)", - "14,1": "项目方案：", - "17,1": "预算方案：" + "6,12": "商务经理：", + "6,16": "%CurrentUser.UserName%", + "6,23": "客服经理：", + "6,27": "%CurrentUser.UserName%", + "8,1": "项目分组：", + "8,12": "项目权限：", + "8,16": "0", + "8,23": "管理模式：", + "8,27": false, + "10,1": "客户名称：", + "10,12": "客户部门：", + "10,23": "客户联系人：", + "12,1": "预算工时(小时)：", + "12,12": "预算费用(元)：", + "12,23": "工时分配方式：", + "14,1": "计划开始日期：", + "14,12": "计划完成日期：", + "14,23": "计划工期(天)：", + "14,27": "=DATEDIF(F12,Q12)", + "16,1": "项目方案：", + "19,1": "预算方案：", + "21,13": "权限" }, "Formulas": { - "1,33": "IF(C21,H21,G21)", - "12,27": "DATEDIF(F13,Q13,\"d\")", - "8,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F9),\"null\",F9)&\"&$top=1\"),\"\")" + "1,33": "IF(C23,H23,G23)", + "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", + "14,27": "DATEDIF(F15,Q15,\"d\")" }, "AttachInfos": { "0,35": { @@ -516,12 +533,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "ad5754db-0cd6-411c-ae54-d76dc01047a6" + "ID": "2980c962-cbe0-4205-81dc-4a40c11acbc4" } ] } ], - "ID": "29f3f6de-d59d-419c-936a-3d2a7ebcd669" + "ID": "7e5894a7-6881-451f-b3e5-b97dd03fdf69" }, { "Condition": { @@ -547,7 +564,7 @@ "MethodName": "Refresh" } ], - "ID": "83797b80-ae2f-42bc-88c7-3eeaedba6d2f" + "ID": "ded47b16-ee86-4d09-9dee-3903fcba4b62" } ] } @@ -606,11 +623,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!C21" + "SerializeProperty": "=项目审批!C23" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT(项目审批!C21)" + "SerializeProperty": "=NOT(项目审批!C23)" } } ] @@ -741,6 +758,174 @@ } }, "6,16": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "7acd220a-61b3-409c-8fc8-cafac926af17" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.UserName%", + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "52311460-6074-4bea-bc8d-f927d510be8d", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "77c2b6d5-c807-4b75-a34a-0f2c5c6f509b" + }, + "ColumnName": "value" + }, + { + "GUID": "c800e201-05c8-4a64-8498-0d0e751d1346", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "e188a7a9-af55-4d6f-9a81-60ebfbf95967" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "6,27": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "80018632-5956-4147-8e9e-07a1fb664fef" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.UserName%", + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "52311460-6074-4bea-bc8d-f927d510be8d", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "f0345796-3c6c-4d3f-9d8b-b5f4c7ce1290" + }, + "ColumnName": "value" + }, + { + "GUID": "c800e201-05c8-4a64-8498-0d0e751d1346", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "6a9deb08-6527-4054-8b26-bc1ce73dc15e" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", @@ -820,7 +1005,53 @@ "noMatchText": "无匹配数据" } }, - "6,27": { + "8,16": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "3809b5d8-8022-437d-987f-b91a6bf85c71" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "0", + "options": [ + { + "value": "0", + "label": "私有" + }, + { + "value": "1", + "label": "公开" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,27": { "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", @@ -832,7 +1063,7 @@ "Style": 2 } }, - "8,5": { + "10,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户", @@ -915,7 +1146,7 @@ "IgnoreBlank": false } }, - "8,16": { + "10,16": { "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", @@ -993,7 +1224,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!F9" + "SerializeProperty": "=项目审批!F11" } }, "CustomColumns": [] @@ -1010,7 +1241,7 @@ "IgnoreBlank": false } }, - "8,27": { + "10,27": { "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", @@ -1050,7 +1281,7 @@ "IsDisabled": true } }, - "10,5": { + "12,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算工时", @@ -1079,7 +1310,7 @@ "controls": false } }, - "10,16": { + "12,16": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算费用", @@ -1109,7 +1340,7 @@ "controlsPosition": true } }, - "10,27": { + "12,27": { "BindingInfo": { "TableName": "项目表", "ColumnName": "工时分配方式", @@ -1192,7 +1423,7 @@ "IgnoreBlank": false } }, - "12,5": { + "14,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划开始日期", @@ -1230,7 +1461,7 @@ }, "DataValidationInfo": {} }, - "12,16": { + "14,16": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划完成日期", @@ -1267,7 +1498,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "12,27": { + "14,27": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计算计划工期", @@ -1298,7 +1529,7 @@ "controls": false } }, - "14,5": { + "16,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目方案", @@ -1333,7 +1564,7 @@ "IsSmallButtonMode": true } }, - "17,5": { + "19,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "预算方案", @@ -1368,7 +1599,7 @@ "IsSmallButtonMode": true } }, - "20,2": { + "22,2": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "展开审批记录", @@ -1384,7 +1615,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!C21" + "SerializeProperty": "=项目审批!C23" } } ] @@ -1392,7 +1623,7 @@ ] } }, - "20,6": { + "22,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "展开审批记录", @@ -1401,7 +1632,7 @@ "UseCellForeColor": true } }, - "20,7": { + "22,7": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "展开审批记录", @@ -1410,7 +1641,7 @@ "UseCellForeColor": true } }, - "20,8": { + "22,8": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", @@ -1472,15 +1703,6 @@ { "BorderBottom": 0 }, - { - "FontSize": 13.333333333333332, - "Foreground": 5, - "HorizontalAlignment": 3 - }, - { - "FontSize": 13.333333333333332, - "Foreground": 1 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -1492,18 +1714,22 @@ "FontSize": 13.333333333333332, "Foreground": 1 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 5, + "Formatter": 7, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 7 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 5, - "Formatter": 8, - "HorizontalAlignment": 3 + "Formatter": 8 }, { "FontFamily": 0, @@ -1523,6 +1749,15 @@ "Foreground": 1, "Formatter": 11 }, + { + "FontSize": 13.333333333333332, + "Foreground": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 7 + }, { "FontSize": 13.333333333333332 }, @@ -1540,8 +1775,8 @@ "Top", "Text 1 50", "Background 2 0", - "\"严格\";\"宽松\";\"宽松\"", "[AUTO]General", + "\"严格\";\"宽松\";\"宽松\"", "0.0\"小时\"", "yyyy/m/d", "0\"天\"" @@ -1626,92 +1861,66 @@ "4,33": 10, "5,1": 0, "6,1": 11, + "6,2": 0, + "6,3": 0, + "6,4": 0, "6,5": 12, - "6,12": 13, + "6,6": 0, + "6,7": 0, + "6,8": 0, + "6,9": 0, + "6,10": 0, + "6,12": 11, "6,13": 0, "6,14": 0, "6,15": 0, - "6,16": 14, - "6,23": 13, + "6,16": 12, + "6,23": 11, "6,24": 0, "6,25": 0, "6,26": 0, - "6,27": 15, - "6,34": 15, - "8,0": 0, - "8,1": 13, + "6,27": 12, + "7,1": 0, + "8,1": 11, "8,2": 0, "8,3": 0, "8,4": 0, - "8,5": 14, - "8,11": 0, - "8,12": 16, + "8,5": 12, + "8,6": 0, + "8,7": 0, + "8,8": 0, + "8,9": 0, + "8,10": 0, + "8,12": 13, "8,13": 0, "8,14": 0, "8,15": 0, "8,16": 14, - "8,22": 0, - "8,23": 16, + "8,23": 11, "8,24": 0, "8,25": 0, "8,26": 0, - "8,27": 14, - "8,34": 14, - "8,36": 0, - "9,0": 0, - "9,1": 0, - "9,2": 0, - "9,3": 0, - "9,4": 0, - "9,5": 0, - "9,6": 0, - "9,7": 0, - "9,8": 0, - "9,9": 0, - "9,10": 0, - "9,11": 0, - "9,12": 0, - "9,13": 0, - "9,14": 0, - "9,15": 0, - "9,16": 0, - "9,17": 0, - "9,18": 0, - "9,19": 0, - "9,20": 0, - "9,21": 0, - "9,22": 0, - "9,23": 0, - "9,24": 0, - "9,25": 0, - "9,26": 0, - "9,27": 0, - "9,28": 0, - "9,29": 0, - "9,30": 0, - "9,31": 0, - "9,32": 0, - "9,33": 0, - "9,34": 0, - "9,36": 0, + "8,27": 15, + "8,34": 15, "10,0": 0, - "10,1": 16, + "10,1": 11, "10,2": 0, "10,3": 0, "10,4": 0, - "10,5": 17, + "10,5": 12, "10,11": 0, - "10,12": 16, + "10,12": 13, "10,13": 0, "10,14": 0, "10,15": 0, - "10,16": 14, - "10,23": 16, + "10,16": 12, + "10,22": 0, + "10,23": 13, "10,24": 0, "10,25": 0, "10,26": 0, - "10,27": 14, - "10,34": 14, + "10,27": 12, + "10,34": 12, "10,36": 0, "11,0": 0, "11,1": 0, @@ -1750,24 +1959,23 @@ "11,34": 0, "11,36": 0, "12,0": 0, - "12,1": 16, + "12,1": 13, "12,2": 0, "12,3": 0, "12,4": 0, - "12,5": 18, + "12,5": 16, "12,11": 0, - "12,12": 16, + "12,12": 13, "12,13": 0, "12,14": 0, "12,15": 0, - "12,16": 18, - "12,22": 0, - "12,23": 16, + "12,16": 12, + "12,23": 13, "12,24": 0, "12,25": 0, "12,26": 0, - "12,27": 19, - "12,34": 19, + "12,27": 12, + "12,34": 12, "12,36": 0, "13,0": 0, "13,1": 0, @@ -1805,65 +2013,140 @@ "13,33": 0, "13,34": 0, "13,36": 0, - "14,1": 16, + "14,0": 0, + "14,1": 13, "14,2": 0, "14,3": 0, "14,4": 0, - "14,5": 12, - "14,34": 12, - "15,1": 16, - "15,2": 16, - "15,3": 16, - "15,4": 16, - "15,34": 12, - "16,0": 0, - "16,1": 0, + "14,5": 17, + "14,11": 0, + "14,12": 13, + "14,13": 0, + "14,14": 0, + "14,15": 0, + "14,16": 17, + "14,22": 0, + "14,23": 13, + "14,24": 0, + "14,25": 0, + "14,26": 0, + "14,27": 18, + "14,34": 18, + "14,36": 0, + "15,0": 0, + "15,1": 0, + "15,2": 0, + "15,3": 0, + "15,4": 0, + "15,5": 0, + "15,6": 0, + "15,7": 0, + "15,8": 0, + "15,9": 0, + "15,10": 0, + "15,11": 0, + "15,12": 0, + "15,13": 0, + "15,14": 0, + "15,15": 0, + "15,16": 0, + "15,17": 0, + "15,18": 0, + "15,19": 0, + "15,20": 0, + "15,21": 0, + "15,22": 0, + "15,23": 0, + "15,24": 0, + "15,25": 0, + "15,26": 0, + "15,27": 0, + "15,28": 0, + "15,29": 0, + "15,30": 0, + "15,31": 0, + "15,32": 0, + "15,33": 0, + "15,34": 0, + "15,36": 0, + "16,1": 13, "16,2": 0, "16,3": 0, "16,4": 0, - "16,5": 0, - "16,6": 0, - "16,7": 0, - "16,8": 0, - "16,9": 0, - "16,10": 0, - "16,11": 0, - "16,12": 0, - "16,13": 0, - "16,14": 0, - "16,15": 0, - "16,16": 0, - "16,17": 0, - "16,18": 0, - "16,19": 0, - "16,20": 0, - "16,21": 0, - "16,22": 0, - "16,23": 0, - "16,24": 0, - "16,25": 0, - "16,26": 0, - "16,27": 0, - "16,28": 0, - "16,29": 0, - "16,30": 0, - "16,31": 0, - "16,32": 0, - "16,33": 0, - "16,34": 0, - "16,36": 0, - "17,0": 0, - "17,1": 16, - "17,2": 0, - "17,3": 0, - "17,4": 0, - "17,5": 14, - "17,34": 14, - "17,36": 0, - "18,34": 14, - "20,2": 20, - "20,6": 21, - "20,7": 21 + "16,5": 19, + "16,34": 19, + "17,1": 13, + "17,2": 13, + "17,3": 13, + "17,4": 13, + "17,34": 19, + "18,0": 0, + "18,1": 0, + "18,2": 0, + "18,3": 0, + "18,4": 0, + "18,5": 0, + "18,6": 0, + "18,7": 0, + "18,8": 0, + "18,9": 0, + "18,10": 0, + "18,11": 0, + "18,12": 0, + "18,13": 0, + "18,14": 0, + "18,15": 0, + "18,16": 0, + "18,17": 0, + "18,18": 0, + "18,19": 0, + "18,20": 0, + "18,21": 0, + "18,22": 0, + "18,23": 0, + "18,24": 0, + "18,25": 0, + "18,26": 0, + "18,27": 0, + "18,28": 0, + "18,29": 0, + "18,30": 0, + "18,31": 0, + "18,32": 0, + "18,33": 0, + "18,34": 0, + "18,36": 0, + "19,0": 0, + "19,1": 13, + "19,2": 0, + "19,3": 0, + "19,4": 0, + "19,5": 12, + "19,34": 12, + "19,36": 0, + "20,34": 12, + "21,13": 20, + "21,14": 14, + "21,15": 14, + "21,16": 14, + "21,17": 14, + "21,18": 14, + "21,19": 14, + "21,20": 14, + "21,21": 14, + "21,22": 14, + "22,2": 21, + "22,6": 22, + "22,7": 22, + "22,14": 14, + "22,15": 14, + "22,16": 14, + "22,17": 14, + "22,18": 14, + "22,19": 14, + "22,20": 14, + "22,21": 14, + "22,22": 14 }, "SheetStyle": { "FontFamily": 0 @@ -1871,29 +2154,23 @@ }, "Spans": [ "1,1,3,2", - "6,1,1,4", - "6,12,1,4", - "6,23,1,4", - "8,1,1,4", - "8,12,1,4", "8,23,1,4", - "12,1,1,4", - "12,12,1,4", - "12,23,1,4", - "14,1,1,4", - "17,1,1,4", - "17,5,2,29", - "14,5,2,29", "10,1,1,4", "10,12,1,4", "10,23,1,4", - "0,35,20,1", + "14,1,1,4", + "14,12,1,4", + "14,23,1,4", + "16,1,1,4", + "19,1,1,4", + "19,5,2,29", + "16,5,2,29", + "12,1,1,4", + "12,12,1,4", + "12,23,1,4", + "0,35,22,1", "1,33,3,1", - "20,2,1,4", - "6,16,1,6", - "6,27,1,7", - "8,5,1,6", - "8,16,1,6", + "22,2,1,4", "8,27,1,7", "10,5,1,6", "10,16,1,6", @@ -1901,11 +2178,23 @@ "12,5,1,6", "12,16,1,6", "12,27,1,7", - "20,8,1,3", + "14,5,1,6", + "14,16,1,6", + "14,27,1,7", + "22,8,1,3", "3,4,1,16", - "6,5,1,6", "1,4,1,16", - "1,21,1,11" + "1,21,1,11", + "6,1,1,4", + "6,5,1,6", + "6,12,1,4", + "6,23,1,4", + "6,27,1,7", + "6,16,1,6", + "8,1,1,4", + "8,5,1,6", + "8,16,1,6", + "8,12,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1935,7 +2224,7 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "项目审批!$I$21" + "Formula": "项目审批!$I$23" } ] -}//fhwKhOf6AzP3McqWxm8GizVX86NftW/U/BwUx2hzryMzXoSENhJs+SZtGP5ILem1H+J07FQMZDSFbdBQSTJ/bUZ1QsNYeFtozpq3fO67yy7yEA2fp5ZuECGoilu2r4OoyejSvYK0MaUskrc6BRj2amLMO3dgubuCNmHCpjy9lr6obIq4kbrApaz7cLiHNTvGALvdNrfSR035ik/lixtydvQ3DqcLV/iGSKGY+TVD1t3aAC9VUuziAre2b27hBqSuG+IzHrgYTxN7eEWACE2U0mQ37NEmWDjKJJaH9OIGZ7bC2J1uELBgem3P0VEN+9d6JiO080r1Su5GrE9cInRF7va9YCOlY6rXCbL0o1vtiBcKXWoWfvVY2re9ZEVwm2zWjGK40QeAxI1OwXlptUYIZJ6dnlrOVAWIiZIo4o81j98+FVYTRZmzeLWE0lcc+3a5fMU65mrG47aj7Koul9gT/JyjsGllG/WGUMINK14bDZaob2Bce2rigFvIQ6T8VKiVCRrkstVpqutXKSBRKSORkddlx4EgQNmoLGotutxVIPVWKENsMC5i2wI6/eiQJrKiiOj102hihvr6dq0yBl1gjsc2yhl18cWZ3gW+X0BT2WrtE2bMzMqZGpSlT1j9etbrb0JBdOhq9UssTnl9F6pXHhPqvh4/OtHs5CVxV9LOvTT2PCcis4L0forMKR5XkMQBsuKja9kqxXRB6LXLw5hWM8EDUWWjhW9A4NUqU/+BVLR1HHmCuMDtozQd9Fc57WAPMddq7NiYZ8Fl/IT7zvZGBOHFFGQrE4NkrI94J2/jtfr6kB7VrV6jyFTUG99qS+qrUV98lk5AsJklh0jhhmQnrVZlHhUw4V5oAvCZDouI7E2FQTRVaYpC3mU7mcrXwX+cTlv+rtBS7Nb8MIs68DZ4cw==|920 \ No newline at end of file +}//jVLsFHASX1xdDg44G9Vamhid00Wh1abO5FkcpOjGFewP9JQOT8wnoy39/gFbQSH6QV73lfGRADW5NM3PU98Z7XJEDLZiSlptuqZHDBpPxzYysNKxrYyV3fEEEUbanuZMc8RBMxGZCpQ8Td/6Ut3cI9+TL085mn3tq/7uISaMwYXZ/wE18IcyEUZjb/SrUmaDxd8zzdmzfnGq//58isjP/5sdvA0O9JsG/ajbAh73/PcQ3yDZqNfYGMCknEnx8sK5F8k2H6EyXWVgObKQeIPRoEdZ2fvS1AGlUDY9PnM+dnzb0AMigLf4ME8X09PhedHwXIFDbbvqhIDG9lRnKiQbSXqn/tfkiTsQM6sKPgIlFtabmv/mjttVqaegBezNCPzNU5fGEyU53jdLL+Pa23bzaVQEHqu0xoaTyfF89ipR4aYUecgNunsLfD2Vct9QM76DvcmvTVbRiN7DKNlu4Z09pIlBL9+8FkXGPhrHcryzA/ME2ufRk5cjleeHyumuQ44HIXsoToadY221vP8QNAzh0keglY6/yvFRm3SCVXQY67yXPFV6CUvkj7fKqRir7fG2I7buckAE8W+ghuz4CWpSLgmzDW8ZgvdCW4ZtiAI3dQ/LXE0HBJ23DooD30mttjRXI6nFoondfvi6mb2b/yt/WpsmnJMDQSlfL8DbaUm3nqfCMXKI9f1/fKvxAzSYz4/F3lSs6K+GDLZr6SObB+6W3Va5QEGmRC2wob+R90ZBCxCOuTBEz/DHwRNLgT5QgVS60XVXy+uEFUafY/GGaOIs5XZ33Nd+Wi2XrBq5Bzn0xqgzuy12xqkYRnbdbf7z3u49wyVf7y/EMmmjfQRVb4MeMZ/coev+jDdtF6au93UL91jzfm5X9cfN3E3AsVOgYiz8VXKi/eQXUy+2lqNINZ5yww==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index 6c890be0..9ed6815f 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -1,16 +1,16 @@ { "PageType": 0, "ColumnCount": 37, - "RowCount": 21, + "RowCount": 23, "Formulas": { - "1,33": "IF(C21,H21,G21)", - "12,27": "DATEDIF(F13,Q13,\"d\")", - "8,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F9),\"null\",F9)&\"&$top=1\"),\"\")" + "1,33": "IF(C23,H23,G23)", + "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", + "14,27": "DATEDIF(F15,Q15,\"d\")" }, "CustomNames": [ { "Name": "项目ID", - "Formula": "项目审批!$I$21" + "Formula": "项目审批!$I$23" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 70dfcddf..95ac67e8 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -97,11 +97,6 @@ "DesignLengthInPixel": 35.0 } }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -114,7 +109,7 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "23": { @@ -129,7 +124,7 @@ }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 30.0 } }, "26": { @@ -139,7 +134,7 @@ }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 81.0 + "DesignLengthInPixel": 35.0 } }, "28": { @@ -168,6 +163,21 @@ } }, "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 81.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { "GridRowColumnDefinition": { "DesignLengthInPixel": 81.0, "Mode": 2, @@ -179,17 +189,22 @@ } } }, - "35": { + "38": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } } }, "InLogicalVisibleIndexes": [ - 35 + 38 ], - "Count": 36, + "Count": 39, "DefaultSize": 32.0 }, "Cols": { @@ -281,30 +296,32 @@ "14,1": "所属客户", "14,12": "添加", "14,15": "所属客户部门", - "17,1": "管理员", - "17,8": "权限", - "17,15": "分组", - "17,19": "添加", - "18,8": "0", - "18,15": "未分组", - "20,1": "预算工时", - "20,8": "预算金额", - "20,15": "严格模式", - "21,1": "0", - "21,8": "0", - "21,15": false, - "23,1": "工时分配模式", - "23,4": "*提交后不再支持修改！", - "24,1": 4, - "24,18": "如何选择", - "26,1": "项目方案", - "29,1": "预算方案", - "32,1": "网络资源", - "35,12": "%CurrentUser.UserName%" + "17,1": "项目经理", + "17,8": "商务经理", + "17,15": "客服经理", + "20,1": "分组", + "20,12": "添加", + "20,15": "权限", + "21,1": "未分组", + "21,15": "0", + "23,1": "预算工时", + "23,8": "预算金额", + "23,15": "严格模式", + "24,1": "0", + "24,8": "0", + "24,15": false, + "26,1": "工时分配模式", + "26,4": "*提交后不再支持修改！", + "27,1": 4, + "27,18": "如何选择", + "29,1": "项目方案", + "32,1": "预算方案", + "35,1": "网络资源", + "38,12": "%CurrentUser.UserName%" }, "Formulas": { - "12,15": "DATEDIF(E36,I36,\"d\")", - "12,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")" + "12,15": "DATEDIF(E39,I39,\"d\")", + "12,1": "TEXT(E39,\"yyyy-mm-dd\")&\",\"&TEXT(I39,\"yyyy-mm-dd\")" }, "AttachInfos": { "1,1": { @@ -351,7 +368,7 @@ "BtnText": "知道了" } ], - "ID": "e0c9b779-22e1-4a1b-98aa-ae32c81d6bb6" + "ID": "d506c3ef-fe13-4c2c-aadc-dfe9f1fa587f" }, { "CommandList": [ @@ -421,7 +438,7 @@ "ParamName": "项目方案", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B28" + "SerializeProperty": "=项目信息!B31" } }, { @@ -429,7 +446,7 @@ "ParamName": "预算方案", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B31" + "SerializeProperty": "=项目信息!B34" } }, { @@ -461,7 +478,7 @@ "ParamName": "权限", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I19" + "SerializeProperty": "=项目信息!P22" } }, { @@ -469,7 +486,7 @@ "ParamName": "分组", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P19" + "SerializeProperty": "=项目信息!B22" } }, { @@ -477,7 +494,7 @@ "ParamName": "预算工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B22" + "SerializeProperty": "=项目信息!B25" } }, { @@ -485,7 +502,7 @@ "ParamName": "预算金额", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I22" + "SerializeProperty": "=项目信息!I25" } }, { @@ -493,7 +510,7 @@ "ParamName": "严格模式", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P22" + "SerializeProperty": "=项目信息!P25" } }, { @@ -501,7 +518,7 @@ "ParamName": "工时分配方式", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B25" + "SerializeProperty": "=项目信息!B28" } }, { @@ -517,7 +534,7 @@ "ParamName": "开始日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!E36" + "SerializeProperty": "=项目信息!E39" } }, { @@ -525,7 +542,7 @@ "ParamName": "结束日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I36" + "SerializeProperty": "=项目信息!I39" } }, { @@ -533,7 +550,7 @@ "ParamName": "网络资源", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B34" + "SerializeProperty": "=项目信息!B37" } } ], @@ -575,7 +592,7 @@ "ReloadData": true } ], - "ID": "8a2f0832-3ef2-4fc9-aac6-f4a7705b1c83" + "ID": "9b9a85c6-2026-4c68-bb8a-396cf5409e63" }, { "CommandList": [ @@ -590,12 +607,12 @@ "BtnText": "知道了" } ], - "ID": "1775419b-3cc8-4b81-b3b1-4e0636f7f5ae" + "ID": "7b778950-0529-43bf-8a0d-86522a6fa106" } ] } ], - "ID": "7432cbb8-c4ac-4143-8255-881d5f0dec80" + "ID": "a0ece134-59b2-4dc0-a37e-98b7474ca225" } ] } @@ -811,7 +828,7 @@ "Message": "图片生成耗时较久，将在后台生成，请稍后查看！" } ], - "ID": "52c4c95f-4b8f-4fb8-9418-c4161c56b9a9" + "ID": "5f161973-6d39-4c56-85ab-7576fa8d56c9" }, { "CommandList": [ @@ -821,7 +838,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "b9f4e6a1-f872-4fcf-b804-2bb3cddb21f0" + "ID": "7a4eb213-bbd2-4861-a70b-34343184c6eb" } ] } @@ -864,7 +881,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!E36" + "SerializeProperty": "=项目信息!E39" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -874,7 +891,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I36" + "SerializeProperty": "=项目信息!I39" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -983,7 +1000,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "972c706f-83ca-44a3-8e3f-4233e0626212" + "ID": "9ffb0ea5-0357-4d02-ad65-617a609d0649" } ] } @@ -1188,7 +1205,7 @@ ] } ], - "ID": "cf24c503-89a7-421b-b3c9-037643940452" + "ID": "52337051-1947-4679-9cee-ae396f74324d" } ] } @@ -1281,37 +1298,6 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "17,19": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P19" - }, - "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ReloadBindingItems" - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "PageName": "项目分组详情", - "LoadBindingDataOption": 2 - } - ], - "Text": "添加", - "ClickMode": 1, - "TemplateKey": "_RS_Main" - } - }, "18,1": { "BindingInfo": { "TableName": "项目表", @@ -1399,6 +1385,11 @@ ] }, "18,8": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "6f9b7927-b3b3-4b48-a4bc-0659ad7c71fe" + }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1416,17 +1407,54 @@ ] } ], - "DefaultValue": "0", + "useBinding": true, "options": [ { - "value": "0", - "label": "私有" + "value": "黄金糕", + "label": "黄金糕" }, { - "value": "1", - "label": "公开" + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" } ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "b3ce0cfb-a282-4bef-ba70-3b1f5cb6bca4", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "ec0988eb-deb2-48e8-918a-73f4a5ea67b3" + }, + "ColumnName": "value" + }, + { + "GUID": "801f5475-48a6-4149-b5d2-3787f9b1f858", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "4e395101-fd5f-4c47-ade1-c6f5fb99a41c" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, "placeholder": "请选择", "noDataText": "无数据", "filterInServerOptions": { @@ -1435,11 +1463,131 @@ }, "noMatchText": "无匹配数据" }, + "DataValidationInfo": { + "IgnoreBlank": false + }, "RulesGuidList": [ - "cfda52e4-b004-454a-9650-2ee428efb4a1" + "e5c38374-3f8b-4d92-bb91-171c1646bc94" ] }, "18,15": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "58ffbcc3-5a53-42eb-91d2-4b997b9502cf" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "b3ce0cfb-a282-4bef-ba70-3b1f5cb6bca4", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "57112d80-c8d6-4256-bf53-b218c9d5cfb8" + }, + "ColumnName": "value" + }, + { + "GUID": "801f5475-48a6-4149-b5d2-3787f9b1f858", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "b19f1a28-4407-4d9d-b547-7afa1edd0447" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + }, + "RulesGuidList": [ + "48a495d0-ed7c-4527-8f9b-c98c9da0eddb" + ] + }, + "20,12": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B22" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ReloadBindingItems" + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "项目分组详情", + "LoadBindingDataOption": 2 + } + ], + "Text": "添加", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + }, + "21,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", @@ -1526,7 +1674,48 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "20,6": { + "21,15": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "0", + "options": [ + { + "value": "0", + "label": "私有" + }, + { + "value": "1", + "label": "公开" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] + }, + "23,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1568,7 +1757,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "20,13": { + "23,13": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1610,7 +1799,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "20,17": { + "23,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1631,7 +1820,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "21,1": { + "24,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算工时", @@ -1665,7 +1854,7 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(INT(项目信息!P22)=0,项目信息!B22>0),1,0)" + "SerializeProperty": "=IF(OR(INT(项目信息!P25)=0,项目信息!B25>0),1,0)" }, "IgnoreBlank": false, "ErrorMessage": "开启严格模式下，预算工时必须大于0" @@ -1675,7 +1864,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "21,8": { + "24,8": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算费用", @@ -1709,7 +1898,7 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(INT(项目信息!B22)=0,项目信息!I22>0),1,0)" + "SerializeProperty": "=IF(OR(INT(项目信息!B25)=0,项目信息!I25>0),1,0)" }, "IgnoreBlank": false, "ErrorMessage": "开启严格模式下，预算工时必须大于0" @@ -1719,7 +1908,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "21,15": { + "24,15": { "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", @@ -1735,7 +1924,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "24,1": { + "27,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "工时分配方式", @@ -1771,7 +1960,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "24,18": { + "27,18": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1797,7 +1986,7 @@ "IconSize": 12.0 } }, - "27,1": { + "30,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目方案", @@ -1835,7 +2024,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "30,1": { + "33,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "预算方案", @@ -1873,7 +2062,7 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "33,1": { + "36,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "网络资源", @@ -1889,21 +2078,21 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, - "35,1": { + "38,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "66ba562c-2d2c-49db-8383-b5118215cd00" } }, - "35,4": { + "38,4": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划开始日期", "GUID": "de12a945-d880-4883-b6cd-af3289b14708" } }, - "35,8": { + "38,8": { "BindingInfo": { "TableName": "项目表", "ColumnName": "计划完成日期", @@ -2133,78 +2322,50 @@ "15,1": 0, "15,15": 0, "15,21": 0, - "17,0": 0, "17,1": 1, "17,2": 0, "17,3": 0, "17,4": 0, "17,5": 0, "17,6": 0, - "17,7": 0, "17,8": 1, "17,9": 0, "17,10": 0, "17,11": 0, "17,12": 0, "17,13": 0, - "17,14": 0, - "17,15": 0, + "17,15": 1, "17,16": 0, "17,17": 0, "17,18": 0, - "17,19": 4, + "17,19": 0, "17,20": 0, - "17,21": 0, - "18,0": 0, "18,1": 0, + "18,2": 0, + "18,3": 0, + "18,4": 0, + "18,5": 0, + "18,6": 0, "18,8": 0, - "18,9": 0, - "18,10": 0, - "18,11": 0, - "18,12": 0, - "18,13": 0, - "18,14": 0, "18,15": 0, - "18,16": 0, - "18,17": 0, - "18,18": 0, - "18,19": 0, - "18,20": 0, - "18,21": 0, - "20,1": 1, + "20,0": 0, + "20,1": 0, "20,2": 0, "20,3": 0, "20,4": 0, - "20,5": 0, - "20,6": 5, "20,7": 0, - "20,8": 1, - "20,9": 0, - "20,10": 0, - "20,11": 0, - "20,12": 0, - "20,13": 5, + "20,12": 4, + "20,13": 0, "20,14": 0, "20,15": 1, "20,16": 0, - "20,17": 5, + "20,17": 0, "20,18": 0, "20,19": 0, "20,20": 0, "20,21": 0, + "21,0": 0, "21,1": 0, - "21,2": 0, - "21,3": 0, - "21,4": 0, - "21,5": 0, - "21,6": 0, - "21,7": 0, - "21,8": 0, - "21,9": 0, - "21,10": 0, - "21,11": 0, - "21,12": 0, - "21,13": 0, "21,14": 0, "21,15": 0, "21,16": 0, @@ -2213,51 +2374,45 @@ "21,19": 0, "21,20": 0, "21,21": 0, - "22,0": 0, - "22,1": 0, - "22,2": 0, - "22,3": 0, - "22,4": 0, - "22,5": 0, - "22,6": 0, - "22,7": 0, - "22,8": 0, - "22,9": 0, - "22,10": 0, - "22,11": 0, - "22,12": 0, - "22,13": 0, - "22,14": 0, - "22,15": 0, - "22,16": 0, - "22,17": 0, - "22,18": 0, - "22,19": 0, - "22,20": 0, - "22,21": 0, - "23,0": 0, - "23,1": 0, + "23,1": 1, "23,2": 0, "23,3": 0, - "23,4": 6, + "23,4": 0, "23,5": 0, - "23,6": 0, + "23,6": 5, "23,7": 0, - "23,8": 0, + "23,8": 1, "23,9": 0, "23,10": 0, "23,11": 0, "23,12": 0, - "23,13": 0, + "23,13": 5, "23,14": 0, - "23,15": 0, + "23,15": 1, "23,16": 0, + "23,17": 5, "23,18": 0, "23,19": 0, + "23,20": 0, "23,21": 0, - "24,0": 0, "24,1": 0, - "24,18": 7, + "24,2": 0, + "24,3": 0, + "24,4": 0, + "24,5": 0, + "24,6": 0, + "24,7": 0, + "24,8": 0, + "24,9": 0, + "24,10": 0, + "24,11": 0, + "24,12": 0, + "24,13": 0, + "24,14": 0, + "24,15": 0, + "24,16": 0, + "24,17": 0, + "24,18": 0, "24,19": 0, "24,20": 0, "24,21": 0, @@ -2284,10 +2439,10 @@ "25,20": 0, "25,21": 0, "26,0": 0, - "26,1": 1, + "26,1": 0, "26,2": 0, "26,3": 0, - "26,4": 0, + "26,4": 6, "26,5": 0, "26,6": 0, "26,7": 0, @@ -2300,11 +2455,37 @@ "26,14": 0, "26,15": 0, "26,16": 0, - "26,17": 0, "26,18": 0, "26,19": 0, - "26,20": 0, "26,21": 0, + "27,0": 0, + "27,1": 0, + "27,18": 7, + "27,19": 0, + "27,20": 0, + "27,21": 0, + "28,0": 0, + "28,1": 0, + "28,2": 0, + "28,3": 0, + "28,4": 0, + "28,5": 0, + "28,6": 0, + "28,7": 0, + "28,8": 0, + "28,9": 0, + "28,10": 0, + "28,11": 0, + "28,12": 0, + "28,13": 0, + "28,14": 0, + "28,15": 0, + "28,16": 0, + "28,17": 0, + "28,18": 0, + "28,19": 0, + "28,20": 0, + "28,21": 0, "29,0": 0, "29,1": 1, "29,2": 0, @@ -2327,31 +2508,6 @@ "29,19": 0, "29,20": 0, "29,21": 0, - "30,0": 0, - "30,1": 0, - "30,21": 0, - "31,0": 0, - "31,1": 0, - "31,2": 0, - "31,3": 0, - "31,4": 0, - "31,5": 0, - "31,6": 0, - "31,7": 0, - "31,8": 0, - "31,9": 0, - "31,10": 0, - "31,11": 0, - "31,12": 0, - "31,13": 0, - "31,14": 0, - "31,15": 0, - "31,16": 0, - "31,17": 0, - "31,18": 0, - "31,19": 0, - "31,20": 0, - "31,21": 0, "32,0": 0, "32,1": 1, "32,2": 0, @@ -2375,11 +2531,58 @@ "32,20": 0, "32,21": 0, "33,0": 0, - "33,1": 8, + "33,1": 0, "33,21": 0, + "34,0": 0, + "34,1": 0, + "34,2": 0, + "34,3": 0, + "34,4": 0, + "34,5": 0, + "34,6": 0, + "34,7": 0, + "34,8": 0, + "34,9": 0, + "34,10": 0, + "34,11": 0, + "34,12": 0, + "34,13": 0, + "34,14": 0, + "34,15": 0, + "34,16": 0, + "34,17": 0, "34,18": 0, "34,19": 0, - "34,20": 0 + "34,20": 0, + "34,21": 0, + "35,0": 0, + "35,1": 1, + "35,2": 0, + "35,3": 0, + "35,4": 0, + "35,5": 0, + "35,6": 0, + "35,7": 0, + "35,8": 0, + "35,9": 0, + "35,10": 0, + "35,11": 0, + "35,12": 0, + "35,13": 0, + "35,14": 0, + "35,15": 0, + "35,16": 0, + "35,17": 0, + "35,18": 0, + "35,19": 0, + "35,20": 0, + "35,21": 0, + "36,0": 0, + "36,1": 8, + "36,21": 0, + "37,18": 0, + "37,19": 0, + "37,20": 0 }, "SheetStyle": { "FontFamily": 0, @@ -2387,34 +2590,36 @@ } }, "Spans": [ - "18,1,1,6", - "18,8,1,6", - "18,15,1,6", - "21,15,1,6", - "21,1,1,6", - "21,8,1,6", - "27,1,1,20", + "24,15,1,6", + "24,1,1,6", + "24,8,1,6", "30,1,1,20", + "33,1,1,20", "15,15,1,6", "15,1,1,13", "7,6,3,15", "4,1,4,4", - "35,1,1,3", - "35,4,1,4", - "35,8,1,4", + "38,1,1,3", + "38,4,1,4", + "38,8,1,4", "12,15,1,6", "12,1,1,13", - "33,1,1,20", - "24,18,1,3", - "24,1,1,16", + "36,1,1,20", + "27,18,1,3", + "27,1,1,16", "4,6,1,9", "4,16,1,5", "14,12,1,2", - "17,19,1,2", "9,1,1,4", "1,18,1,3", "1,1,1,5", - "35,12,1,4" + "38,12,1,4", + "18,1,1,6", + "18,8,1,6", + "18,15,1,6", + "21,15,1,6", + "21,1,1,13", + "20,12,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2471,7 +2676,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$22),1,0)" + "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$25),1,0)" }, "Priority": 3, "GUID": "b86e7249-aa30-4c1d-9c20-7cd975817126", @@ -2487,7 +2692,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$22),1,0)" + "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$25),1,0)" }, "Priority": 2, "GUID": "8b0ef132-4ea9-4190-83e9-fa06a9bd6dd3", @@ -2503,7 +2708,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$22),1,0)" + "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$25),1,0)" }, "Priority": 1, "GUID": "c6a3b850-e670-401e-87fc-553622e7d5ec", @@ -2519,7 +2724,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$22),1,0)" + "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$25),1,0)" }, "GUID": "80882aaf-77a4-42c8-a371-0d9c66111d9c", "StyleInfo": { @@ -2529,6 +2734,34 @@ "IsDisabled": true, "IsInvisible": false, "IsReadOnly": true + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" + }, + "Priority": 5, + "GUID": "e5c38374-3f8b-4d92-bb91-171c1646bc94", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" + }, + "Priority": 5, + "GUID": "48a495d0-ed7c-4527-8f9b-c98c9da0eddb", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true } ] } @@ -2540,15 +2773,15 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "项目信息!$B$36" + "Formula": "项目信息!$B$39" }, { "Name": "当前用户", - "Formula": "项目信息!$M$36" + "Formula": "项目信息!$M$39" }, { "Name": "项目经理", "Formula": "项目信息!$B$19" } ] -}//xL7TFEBJY4+lJdlF4sKDRbIO7i8JEHDe7gQypkc75rwktu0Xw48NxLrKJ0wK7DNxO9cQ61ZaTNNOk6dISobVSyTwKP7OcWteVnYQLEf8oESrIxnMbWlnXldgbplydMre+DKaqTOcInseeSi4yXuWNZQvr9DT5EXwt4oiJS9Laq1YDOvx75+l9iuxylNbSVnHcstONm8Jdb8GpzinCeyF8GJyhNAnc5V9SmQb1ZVwo7DV8C4497KUu8JWfzQDAHLy01UKI2PCBZWfoqNnDBjGemb+R/8e09vX9I6Hcxi7GWOIdVqoIzo5+k+tG9UTaxjN64XMXHhYYiwmY3DuIwB5CLEJqY/AdftCr63ee5SEuPDmI1xRAAwXOQZ6gZQXAQb+8NSK8xiVDuIZufD/ywWYCA5G1VcQKZWXNGRn76WMWYt+3JIWaNmpOlGiRgDDEZnyaiqKwrPvgyuAusXhZFRH/fnE8aOp5x758IJgrv77UyoF5OG6yThgigeUwwBIsnh4XFDyXl+4UMoLOmQsbE8eUveswS1OuIOr5D03X4mBYqbp5YaZN6KKQHPc3N//plfwx7rqH4/WI41d0QGy+O3fTIjH0bJEfY3KAnaHfJPZ5DaYKRCn0Jm26QF1g09n7KMspFrb1xvmqWbyFm7DsL1YhIp+zuPVihbTzjXxYyfuo0Ch9t27pE7kO+Dqi78aNuK742UxEuZbDmouc9hXYl3N8Lowb9/+uCSGGdexkm5QA6qH7hS6V6QIOwj+jQ6kJMjdFoCmMFWkjDawCXN3jcMjKebJmAahzHveNi9TD6njfu3HMGnpuvZFopm/dDfed7rDRVcs5FWuw2kW9sTpRCX1+a3v9KZiMOrPdwYfr16q5HfoaX8ex5u3LXNvsvbzGRp+Q3xys+qhElKk9JCD5m2Yxg==|920 \ No newline at end of file +}//2wSJG61CvXZ+3M3Qc6mKiuqdhmu2LWF82KawiVBbiOmD4Fg2roQ1lAxrnZyMzUlwyh1OjDkM6t4XZjRBUTlQACy6rIKcUjgP1wYqPiJO2P0cjRqCIYSoisKxjG1VmANQdY8uwkEMsZiu7ptKl2V9Bzd/tuxkeiiAiH8lCc9GX53g+hDvFB5/Q2+4be9LAyi96kiB6t8/yWZkCkCfi/ewjUnF4Lb8JdL1nMFnHEt7L6YiSqV7WX1++81fpPu9ypo65kfV/7qDIoeIU1k+wgcdcCSZ3rSFf/VaH3yKUM4EiugEAD+kaLaCYr/4MNoVw7zRCV45ZP+2AmnFAObm0hWzDvHojX+EXqYR1oJFfvSW2NxP+CWkPKCsk26dW8VEy2zHRanSkHQ705oNPydushNOGpd2yVdrp1999tlD3IZAQGjZx16u6lD0anq9EmrGaOjnotUlKNBzXjv8oQ4KOpqyWfG9Wj8YOc+cNT9iJ3CfejnVPcd0klCLpRVVAEvTqSd6wRFAnBvzpMpiGPXGuom6L6V9u4Y5GHYIcp2paTkcP1A4v314akwiVVaWs9Lmn2AiUbGAQAo3VYVQVzAy6z6QgXA0JqL4NyMSt3+WTM4QM+dEW+Xl21wHjDHWPb9Dcg59hIl9ruxMirJqtqp4ToFNUj7CCGp0mCS1eUcRgcrs9IyMLY6QJRsbynfuhCoJ7P0A4p5wKQ+esOyBzo2lzPCsdCdyVHtZAeBOwfeDJlUX3dGwsTRh6FFTIWzD0EEUQwzV8Nm1acIQkzNm16JLpcQzJfMajD5aOBJj2qn5wSsEptJOyhe3nDOifgNeEhBT0yPHfRW5XQlyUjKDuwiQ3gkEeafjhgpiwHjaE2nzsZiCdb0njWmdmpAtQZhO35w5GyiFkBBioiNl/UwBXX1ZVARWSQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.rd b/Pages/项目/项目首页/项目配置/项目信息.rd index bf0487df..87e28979 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.rd +++ b/Pages/项目/项目首页/项目配置/项目信息.rd @@ -1,19 +1,19 @@ { "PageType": 0, "ColumnCount": 22, - "RowCount": 36, + "RowCount": 39, "Formulas": { - "12,15": "DATEDIF(E36,I36,\"d\")", - "12,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")" + "12,15": "DATEDIF(E39,I39,\"d\")", + "12,1": "TEXT(E39,\"yyyy-mm-dd\")&\",\"&TEXT(I39,\"yyyy-mm-dd\")" }, "CustomNames": [ { "Name": "项目ID", - "Formula": "项目信息!$B$36" + "Formula": "项目信息!$B$39" }, { "Name": "当前用户", - "Formula": "项目信息!$M$36" + "Formula": "项目信息!$M$39" }, { "Name": "项目经理", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.json new file mode 100644 index 00000000..9b9553a5 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.json @@ -0,0 +1,387 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 23.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + } + }, + "Count": 10 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 26 + }, + "Values": { + "6,2": "设置", + "6,10": "设置", + "6,18": "设置", + "7,2": "项目经理", + "7,10": "商务经理", + "7,18": "客服经理" + }, + "AttachInfos": { + "2,3": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "a4f711eb-d11b-43b2-a3fb-b925f6acb003" + }, + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像 .png" + }, + "showSystemAvatar": true + } + }, + "2,11": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "e5f6da99-195b-4afa-b550-2333f6e5433d" + }, + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像 .png" + }, + "showSystemAvatar": true + } + }, + "2,19": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "52cca138-0555-4ac2-ae1f-52d3b72664f9" + }, + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像 .png" + }, + "showSystemAvatar": true + } + }, + "6,2": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "464736a9-37f5-402c-996a-16000d6e4b65", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "6,10": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "fd4f5cfe-1da6-4423-bcf9-b30bac7a0ee7", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "6,18": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "d45081a6-27d9-4d3c-be5b-f15c31972536", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "FontSize": 16.0, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 2, + "HorizontalAlignment": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "Center", + "Text 1 50" + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 0, + "1,3": 0, + "1,4": 0, + "1,5": 0, + "1,6": 0, + "1,7": 0, + "1,9": 0, + "1,10": 0, + "1,11": 0, + "1,12": 0, + "1,13": 0, + "1,14": 0, + "1,15": 0, + "1,17": 0, + "1,18": 0, + "1,19": 0, + "1,20": 0, + "1,21": 0, + "1,22": 0, + "1,23": 0, + "1,24": 0, + "2,1": 0, + "2,2": 0, + "2,3": 0, + "2,6": 0, + "2,7": 0, + "2,9": 0, + "2,10": 0, + "2,11": 0, + "2,14": 0, + "2,15": 0, + "2,17": 0, + "2,18": 0, + "2,19": 0, + "2,22": 0, + "2,23": 0, + "2,24": 0, + "3,1": 0, + "3,2": 0, + "3,6": 0, + "3,7": 0, + "3,9": 0, + "3,10": 0, + "3,14": 0, + "3,15": 0, + "3,17": 0, + "3,18": 0, + "3,22": 0, + "3,23": 0, + "3,24": 0, + "4,1": 0, + "4,2": 0, + "4,6": 0, + "4,7": 0, + "4,9": 0, + "4,10": 0, + "4,14": 0, + "4,15": 0, + "4,17": 0, + "4,18": 0, + "4,22": 0, + "4,23": 0, + "4,24": 0, + "5,1": 0, + "5,2": 0, + "5,3": 0, + "5,4": 0, + "5,5": 0, + "5,6": 0, + "5,7": 0, + "5,9": 0, + "5,10": 0, + "5,11": 0, + "5,12": 0, + "5,13": 0, + "5,14": 0, + "5,15": 0, + "5,17": 0, + "5,18": 0, + "5,19": 0, + "5,20": 0, + "5,21": 0, + "5,22": 0, + "5,23": 0, + "5,24": 0, + "6,1": 0, + "6,2": 1, + "6,7": 0, + "6,9": 0, + "6,10": 1, + "6,15": 0, + "6,17": 0, + "6,18": 1, + "6,23": 0, + "6,24": 0, + "7,1": 0, + "7,2": 2, + "7,3": 0, + "7,4": 0, + "7,5": 0, + "7,6": 0, + "7,7": 0, + "7,9": 0, + "7,10": 2, + "7,11": 0, + "7,12": 0, + "7,13": 0, + "7,14": 0, + "7,15": 0, + "7,17": 0, + "7,18": 2, + "7,19": 0, + "7,20": 0, + "7,21": 0, + "7,22": 0, + "7,23": 0, + "7,24": 0, + "8,1": 0, + "8,2": 2, + "8,3": 2, + "8,4": 2, + "8,5": 2, + "8,6": 2, + "8,7": 0, + "8,9": 0, + "8,10": 2, + "8,11": 2, + "8,12": 2, + "8,13": 2, + "8,14": 2, + "8,15": 0, + "8,17": 0, + "8,18": 2, + "8,19": 2, + "8,20": 2, + "8,21": 2, + "8,22": 2, + "8,23": 0, + "8,24": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "7,2,1,5", + "7,10,1,5", + "7,18,1,5", + "6,2,1,5", + "2,3,3,3", + "2,11,3,3", + "6,10,1,5", + "2,19,3,3", + "6,18,1,5" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "BackgroundPictures": [ + { + "Name": "fee9049d-ecb6-4178-923c-4153cc9932d0.png", + "DisplayName": "背景图1", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "10,10", + "Size": "140,153" + }, + { + "Name": "BackgroundPicture1", + "DisplayName": "背景图2", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "170,10", + "Size": "140,153" + }, + { + "Name": "BackgroundPicture2", + "DisplayName": "背景图3", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "330,10", + "Size": "140,153" + } + ] +}//nkIjRFMwL18V91JqkfQG4grSF7EwK5pwZ8MnSAqZ2VG3vK/QJKpvxgzIir07Z76edpg4UT3Tb6MCubeGYB9qi6vP34tLsuEBMaumDfpYlzWOOT8p8Fq94uqrCgIaur8zx/UaUTnAQ9tlKfjrK8u9PT0hDAgCeLKbOFkTvW8PpBoJ2FQ+mqIQ8EVeu46bNfOBV7SFSTFv1EdG2/8la1UpztLQwHJkeNNiIEdFsXANfqDkEF4fhHlcrcTD0JIft7J4moo1eMO2aM1HVNPbsRoYB7dtQXsR+JyDTs0Ki9D2wlv3afFVegQj4CWN+4bOBRJjKiFTUBMdTmxpI0nBra+h6RwukEsxoeeUz6NRllTop508/K77JM1lG3Aazqeve4LSXpj1iatRMr1NzU43kf2Ryxips+NrUbuDKAtGseH8VARh8HPVvFIWxzPBsiUD2SDP2r5eMnqjGSWqgxxiA2X99jmxtJvOKzE869P9FQoal2SBsxTs9/3HKn6vYnwA5Nt7bgxYqmPRwC2AjHJjkW1524SG/2vVp+lXKZzN6T2xEGT5/ssj/3uSwv9PHEm/xId+oMQtQdHjtwOA8Mbz/jxyi5Z+2veojb2xGPJpel4CSIu+5/SoitEgx30LMW5LRc8uKuJSbN4xOD9219B08K55hn/vYxoO7NfH+KDoBlxl+44FjlT2X89maaJNxHCSbumE8vN8XVoIJltc/c6K6RZ3Y+GAcqMA7ncpjU4zkKSKtB3BxKbbehkVgsXFMDAgoPYtBA3VS0qQUfCnzIvr61UAzELcvSnWWTWtylgMYlARydnxRUZugZ9J/WPIgifYM82NIkT71Ku9SmO3EWqIu9iRGbjGdAGa9lvK+fQdVnruB4S241HkCF085MNAzZ0jyViTxUihQ67e3w0FGrW6IXliVA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.rd new file mode 100644 index 00000000..f2b5456c --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目三经理成员.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 26, + "RowCount": 10 +} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json index 1f6362a5..e83dfd22 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json @@ -23,36 +23,56 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 321.0, - "Mode": 1 + "DesignLengthInPixel": 40.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 170.0, + "Mode": 1 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 16.0 } }, "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 40.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "8": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 160.0 + } } }, "InLogicalVisibleIndexes": [ - 8 + 12 ], - "Count": 9, + "Count": 13, "DefaultSize": 24.0 }, "Cols": { @@ -271,7 +291,10 @@ "Values": { "1,31": "岗位管理", "1,36": "添加成员", - "6,1": "添加岗位" + "4,12": "三经理", + "5,12": "项目三经理成员", + "7,12": "项目成员", + "10,1": "添加岗位" }, "AttachInfos": { "1,1": { @@ -579,7 +602,14 @@ } } }, - "4,12": { + "5,12": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目三经理成员", + "OverflowMode": 1 + } + }, + "8,12": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", @@ -634,7 +664,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b04a1b7d-4478-483f-966b-62b20edadcc7" + "ID": "c501410a-1296-4492-9ea5-6edb053e35af" }, { "Condition": { @@ -697,17 +727,17 @@ "BtnText": "知道了" } ], - "ID": "036a5608-e2e5-48fa-a45a-efc278c33b45" + "ID": "d02119c5-04df-4f49-b7c9-e61dbac27627" } ] } ], - "ID": "214a2663-6a5e-4f47-a482-7d6e3c3820f3" + "ID": "b3fe175f-e2f0-4903-8b0d-c46486c0f4ba" } ] } ], - "ID": "817133f6-57c4-46ed-8050-305f333c1d61" + "ID": "51b49389-b7fa-4dd0-b678-7467824a2be8" } ] } @@ -828,7 +858,7 @@ } } }, - "6,1": { + "10,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -885,14 +915,14 @@ "IconSize": 14.0 } }, - "8,1": { + "12,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", "GUID": "92ddc900-e1f3-4049-b67b-cdc5c4c0dffd" } }, - "8,5": { + "12,5": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "ID", @@ -963,6 +993,10 @@ { "HorizontalAlignment": 5 }, + { + "FontFamily": 1, + "HorizontalAlignment": 5 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -1041,62 +1075,80 @@ "4,1": 14, "4,10": 14, "4,11": 13, - "4,12": 14, - "5,1": 14, - "5,2": 14, - "5,3": 14, - "5,4": 14, - "5,5": 14, - "5,6": 14, - "5,7": 14, - "5,8": 14, - "5,9": 14, + "4,12": 5, "5,10": 14, "5,11": 13, - "6,1": 15, "6,10": 14, "6,11": 13, - "6,12": 14, - "6,13": 14, - "6,14": 14, - "6,15": 14, - "6,16": 14, - "6,17": 14, - "6,18": 14, - "6,19": 14, - "6,20": 14, - "6,21": 14, - "6,22": 14, - "6,23": 14, - "6,24": 14, - "6,25": 14, - "6,26": 14, - "6,27": 14, - "6,28": 14, - "6,29": 14, - "6,30": 14, - "6,31": 14, - "6,32": 14, - "6,33": 14, - "6,34": 14, - "6,35": 14, - "6,36": 14, - "6,37": 14, - "6,38": 14, - "6,39": 14, - "7,1": 14, - "7,2": 14, - "7,3": 14, - "7,4": 14, - "7,5": 14, - "7,6": 14, - "7,7": 14, - "7,8": 14, - "7,9": 14, "7,10": 14, "7,11": 13, - "8,5": 2, - "8,10": 2 + "8,1": 14, + "8,2": 14, + "8,3": 14, + "8,4": 14, + "8,5": 14, + "8,6": 14, + "8,7": 14, + "8,8": 14, + "8,9": 14, + "8,10": 14, + "8,11": 13, + "8,12": 15, + "9,1": 14, + "9,2": 14, + "9,3": 14, + "9,4": 14, + "9,5": 14, + "9,6": 14, + "9,7": 14, + "9,8": 14, + "9,9": 14, + "9,10": 14, + "9,11": 13, + "10,1": 16, + "10,10": 14, + "10,11": 13, + "10,12": 14, + "10,13": 14, + "10,14": 14, + "10,15": 14, + "10,16": 14, + "10,17": 14, + "10,18": 14, + "10,19": 14, + "10,20": 14, + "10,21": 14, + "10,22": 14, + "10,23": 14, + "10,24": 14, + "10,25": 14, + "10,26": 14, + "10,27": 14, + "10,28": 14, + "10,29": 14, + "10,30": 14, + "10,31": 14, + "10,32": 14, + "10,33": 14, + "10,34": 14, + "10,35": 14, + "10,36": 14, + "10,37": 14, + "10,38": 14, + "10,39": 14, + "11,1": 14, + "11,2": 14, + "11,3": 14, + "11,4": 14, + "11,5": 14, + "11,6": 14, + "11,7": 14, + "11,8": 14, + "11,9": 14, + "11,10": 14, + "11,11": 13, + "12,5": 2, + "12,10": 2 }, "SheetStyle": { "FontFamily": 1 @@ -1104,14 +1156,15 @@ }, "Spans": [ "1,1,1,9", - "4,12,3,28", - "8,5,1,5", + "12,5,1,5", "1,36,1,4", - "8,1,1,4", - "4,11,3,1", - "4,1,1,9", - "6,1,1,9", - "1,31,1,4" + "12,1,1,4", + "4,11,7,1", + "4,1,5,9", + "10,1,1,9", + "1,31,1,4", + "8,12,1,28", + "5,12,1,28" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1167,11 +1220,11 @@ "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$9" + "Formula": "项目成员!$F$13" }, { "Name": "项目经理", - "Formula": "项目成员!$B$9" + "Formula": "项目成员!$B$13" } ] -}//PR6GBjrJhjaOId3qoJ0LXfVDTgtkIJKeM2LYDVc2AGsusI2LMI9PKeM/nQeHgQuGqiI0uxZ42/HjS783W7SePLbgLlcIeGqfbmzcZgyG2a1Kma+f116ud/CcxUiZxe9yBjPawOlQv7kEsZ2j/LLOWrTtC2x0MrN37xaK94dH4oC9feXs6De6X8oJ0zRttO8g33LM8jY0paiCcnxS8nTWKxviGoKdKRfuMZJI1xoIe1xsUwKgDrPH3QjDJH8IltgGtnFHi4SqiUcqvZGjCALkF68tQgw/6NFC92UTkBWAgNhYeCiLhb4hYzZTGet9ifY7fzWIxkehcbymnruqXayeW/XWyQytEC8NMaOtyLmKJFjQOWcCbWR51kez2D1aerJ9zfbGW2uWL77tKIewCdFedu3rwMyxDt1OB2g/rQj/yQp9mJI5iG7NpH+PIvWEp+X/qEUP61alCYCRlXoI87At30SbtUgrYZAameMQzlivtTjDPpVC5SG26DkyCZYc+eO0V8iMe+BgCIfmnGyAyWPJPNYyqxJIs2C+e0Z67kbGNBxR9Ld2Xe7qhnsROOjh5WMBKI80B7CeDZR+l5JD8XDTBjtdTZwr42F8+s99NW7nyv04XPF3pc1Bfw4BqkT6UyfdVYFwJBAqixkA+vyjV5XmPXqIPIcJ6i/Xkq/QQz/ZP+w1o77pNXDc7ffFuxbk4J3s8G/V1R14eS+H/2L0L0Lwprszwck1lMkAIa3AW2Rlwq1ulyWhrDjQvv9Ev8loeWeaBdgKoEADmggRukBd3qkanRfPKp1+SA/3d7NVt28JiQstzzxVnWADUZpr1ZSA/fcSM2I1bIelFeYd9CGM36tAAOJFHsYMRiAxP9zyfu1uw3mQNVpOSZ1ZTCZHaiOeKXn85wRGaKjg3H2WFWOnq2MC9w==|920 \ No newline at end of file +}//nUDbNGLm2vaFYJnnQx7dh+cReBBZwtL/3YXGPIp41mXOI8O11RiMuJeKhJPzzy5HMhv9IOvj16RjAxpNyvPWAB+p1yHD4dpMTGjdSiT0ReVsbYQCAWmkbMhzT+kMLRNoq2ch6EFXtl6O6JgnFLfrf7JsrVBPEPilPwxEQMSYo2dlKtFyjSDdtl0WyCCH7vpIZrX+x0pSBcH1KVztwpAIL4QFrI74zjeCIjWCREr1T7qEt1XOLuaZQiYiBXz+cMUanArLq98+lxblT39VZiOunlg5VVdtfWQ4AId8dU62qyPBz6ZRJ5hOYOVIK+2MpJ/KnsczAuuw/A5i4TNcvz5YYG63NQJEJkj6dojV2plajo1X1KJPArcviC8J4dEQVsalpOVdMF9xO4KzYvdN6sTmMlnBHmM/tMj6Tvy0wrlwgDMdSjW13SM3ba/4C1Lq45qDvQYbWLKAbcoa7SmLkL2WyqHj5o2kjrbqldhFcJNCebUpRuXmmgoqUvw5kZudZMwwnfErYEqjWkwVentbTFMbG/I15K8ckZfEJcpBGdLt5q60DBAJIOGY9FSOelvMXwRgLMYwaXt+K6aQJxbxTG8OzkDusMkY0yvAAE3wjrcSYu27rWvOeIQ7eRUi/aui+CGSLzPH5XO/+JnoByY/eZsJxfj2CJi5UM7bFm0J61WqEjIVUwu/yZrjm5UZSJIB7UbChNwqIr9ewZb678LUY7R2CiWsoVdxvlmUfkbMVTwAcJBNetDljhjsC8DancTx43M/zpSs1DGOVErF1u3FFUjFCbxPARNTCxgpCpccKmnF0qwpGBp/EWW7WiDXb9eeWhk8IXqlnOYdGN6SVEiM4qdd8h2y6rmvUHllS5osUnA4FzExDdYF+7n7AitojGm3QRMfLZQBtFvvi4oNdcm7dsXdoA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd index 7776d5d8..dd71dc03 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 41, - "RowCount": 9, + "RowCount": 13, "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$9" + "Formula": "项目成员!$F$13" }, { "Name": "项目经理", - "Formula": "项目成员!$B$9" + "Formula": "项目成员!$B$13" } ] } \ No newline at end of file diff --git a/ServerCommands/项目/填充项目初始化数据.json b/ServerCommands/项目/填充项目初始化数据.json index 5bb7757c..f915a7ce 100644 --- a/ServerCommands/项目/填充项目初始化数据.json +++ b/ServerCommands/项目/填充项目初始化数据.json @@ -23,7 +23,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "bf4aa969-2e0d-41a3-b21f-d161c669181d", + "GUID": "f7a65ed7-4765-4780-9f9f-fe529c90475b", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -32,7 +32,7 @@ "ColumnName": "项目状态" }, { - "GUID": "469804af-8359-445e-be3c-29b4c9318b39", + "GUID": "4a60eee5-70ca-4880-aee0-54e898e2e36d", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -41,7 +41,25 @@ "ColumnName": "项目经理" }, { - "GUID": "4a6da440-f343-4b8b-b04a-25e05a3722e8", + "GUID": "488f41ae-2ebe-4f01-b871-5356a83d7545", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "02859306-196f-475f-b592-5f1fd3a3a491" + }, + "ColumnName": "商务经理" + }, + { + "GUID": "02092580-bdb8-43d0-9cb2-369c04a34c29", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "6b6177e6-223c-41e1-8abc-1f84b1af3152" + }, + "ColumnName": "客服经理" + }, + { + "GUID": "64ee4898-87cf-426a-9c38-e898419aba3c", "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户", @@ -50,7 +68,7 @@ "ColumnName": "所属客户" }, { - "GUID": "b89ffe2a-1e59-49ab-9ebd-d5efabb5da8b", + "GUID": "396b8beb-b5aa-49b1-8f92-19dce38d5b52", "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", @@ -64,7 +82,7 @@ "ColumnName": "对接人" }, { - "GUID": "663d7b9e-0ca1-4a74-ba45-cd90994ae50b", + "GUID": "b4413120-7e42-4f8c-a8b6-f19095dee4f7", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -92,7 +110,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "992eab76f1954c7ea32d98b07048191a" + "ID": "d84f769d3cd54a1aa4b58e6951d7b637" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -196,7 +214,8 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "73d108bea1b64c90ae990d7abe350b9f" + "ID": "4b98299255f9465d88a8994f28e0147d", + "Disabled": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -224,7 +243,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "3824b666-e3d7-4ca4-9597-0ed711c5a483" + "GUID": "7261f196-20bb-4620-aff3-0ca5122d6f73" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -235,7 +254,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "f9ffa399-7c8c-458b-8bf7-0b5e569d66ee" + "GUID": "a904ceb4-18aa-4c28-84a6-1886fa9ea84e" }, "Value": "商务经理" }, @@ -243,7 +262,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "9cbe2f8f-a778-4892-b0aa-af88a21c087b" + "GUID": "72669d92-e7da-4e6a-ad77-db20bb3c087c" }, "Value": "负责完成项目经理指派的各个开发任务" }, @@ -251,7 +270,57 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "5d3ad81e-3657-4f41-85a5-8ca2fc45245d" + "GUID": "9b4b64bf-9b66-47a1-a18b-bde8c3348a43" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "商务经理岗位" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "972cb31a-2dfd-4cac-8fd4-481a14ad8e24" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "088a5f1e-0332-4fca-a748-bf0b251490cf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.商务经理" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "c2f6dd30-acfa-48ca-8be3-d4e119201872" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=商务经理岗位.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "43cb9e9d-ac36-4e24-af9b-842459fa229b" }, "Value": "0" } @@ -259,9 +328,10 @@ "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "41c1f236-8ed7-471d-a3da-9d3ef2eadc8a" + "ID": "86e9bc9c-503f-41b0-a010-e4e45cc11e09" } - ] + ], + "Disabled": true }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -297,7 +367,8 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "8c16ae5660ec46649956f17794ce676b" + "ID": "7272dcdc2ad44c2bbcb64c4761041a31", + "Disabled": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -325,7 +396,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "c4572b29-28f2-4ed9-ad9a-a068c7b51915" + "GUID": "0e95a9cc-ba06-4e40-88ec-8f5d8dbbfd21" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -336,7 +407,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "38e961f4-1d10-4c9d-ab64-076b23198645" + "GUID": "da813ab4-02c7-4cbe-923e-a8f103dcd5f6" }, "Value": "项目经理" }, @@ -344,7 +415,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "894ab6f7-805b-4676-a2c8-433da5aec782" + "GUID": "fca452a0-0b0b-44d2-b26a-aa3213ba3c9d" }, "Value": "负责项目整体管理" }, @@ -352,7 +423,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "bcd8f16b-640c-496c-979c-bdd4d8be3bbb" + "GUID": "660bd699-0a64-4adf-a4b3-4617edf80452" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -361,11 +432,62 @@ } ], "ParamNameToSaveNewRowValue": "项目经理岗位" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "4b9361ab-4a3c-400a-9865-78209ff734cd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "be0b5fc8-661d-47b4-a53d-a101019c9f7e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.项目经理" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "acaf81a9-42a6-437d-845a-27f9e9f97121" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理岗位.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "25aba344-2e15-4e3a-8f10-41e1694776d1" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "0ed39ce8-07fd-4c60-b5a4-c4bb450b84c1" + "ID": "0863dd7e-59d1-406b-87be-953265a1bb03" } - ] + ], + "Disabled": true }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -401,7 +523,8 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "fa46bad714df4c128cd0d159f0db8c67" + "ID": "a90161503e7140a0a931eb007edecb89", + "Disabled": true }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -429,7 +552,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "33d71472-5f8d-4a9f-97b3-d11933e87586" + "GUID": "272582fb-8469-4f14-a0d3-b8bc29eee145" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -440,7 +563,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "cdf80327-2cd0-4968-b619-2d1dd26be313" + "GUID": "88379a42-c183-4a88-ac28-6f5839306f45" }, "Value": "客服经理" }, @@ -448,7 +571,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "e1b75950-2747-464f-a170-74261a1d41a8" + "GUID": "0acdb42e-d714-4135-a19d-51803d05a8c8" }, "Value": "客户与开发团队的桥梁，负责商务、沟通事宜" }, @@ -456,17 +579,68 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "7a7c1923-87e8-4d0b-acab-2ca1e6b06145" + "GUID": "30d14a09-6496-4609-bbfc-e89f260095b2" }, "Value": "0" } ], "ParamNameToSaveNewRowValue": "客服经理岗位" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "d3bf612f-597e-4c4a-8d73-e5e789b8b60c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "3e000f19-91c8-4858-8a9d-86d792fe1a47" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.客服经理" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "8b73ee3c-9620-4b9e-993a-9bc0fb65190a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客服经理岗位.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "c921a27d-c492-4f67-b3be-bd484c77a870" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "商务经理岗位" } ], - "ID": "67f08f1e-c7fe-4f1d-97a1-558d35e89a3c" + "ID": "7d8b5496-d844-4499-b041-aae015963591" } - ] + ], + "Disabled": true }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -502,7 +676,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "e2c70170d6e6481abc43581dcc1dc6ce" + "ID": "40d9ef457fa64c5ba39c8683cf9ab2a4" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -530,7 +704,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "项目ID", - "GUID": "dcecb766-7652-4ef6-ace3-5119b1216f11" + "GUID": "cf287984-392b-4664-8286-1a6aa9e745e5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -541,7 +715,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", - "GUID": "53b3627d-2d69-43d9-9faa-2c508e6d55b1" + "GUID": "7a175204-6907-4d79-8d66-69e975a756a2" }, "Value": "开发工程师" }, @@ -549,7 +723,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", - "GUID": "0603f1ab-fadb-41e5-a01b-728c6ed92a5a" + "GUID": "6cbafaf9-5207-4b30-b0cf-9c358f2f1bce" }, "Value": "负责完成项目经理指派的各个开发任务" }, @@ -557,7 +731,7 @@ "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", - "GUID": "9b1db72b-9e27-49ba-ba4b-d8883a460ea7" + "GUID": "e695507b-97c6-44af-b9ea-195bc4697b26" }, "Value": "0" } @@ -565,12 +739,12 @@ "ParamNameToSaveNewRowValue": "开发工程师岗位" } ], - "ID": "abbafe65-98c6-44d7-a8ee-55c719b989da" + "ID": "4d720608-c3e5-41f2-a705-e07bfde14fd3" } ] } ], - "ID": "dc02d41d-2071-44c9-aa3f-b4f947cb1e06" + "ID": "8133bc78-466e-4f85-8de9-18e759248765" }, { "CommandList": [ @@ -580,120 +754,11 @@ "Message": "请先配置项目客户及客户对接人" } ], - "ID": "a221cc22-5a81-48f8-8385-e5c7ae9ac242" + "ID": "e6ef8fe7-8a96-45ac-a9c6-a6a514538b6f" } ], "Comments": "这里对岗位进行逐一判断，没有就加上" }, - { - "$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": "3581a0e6-a389-4da0-ae5e-9b229b6fc6a9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "ea1a0e9e-ded9-4216-b318-d3795fadd527" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目.项目经理" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "f075fd15e3ef4fb09ad8befd53ba47db" - }, - { - "$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": "=项目成员是否已有项目经理" - } - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "df7c0e4e-edd4-4dce-a1b9-d187f0b841d1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "260ccf6f-5d30-4e56-8bf2-60e805a4eba4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目.项目经理" - } - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "4708de91-1dbc-42d4-9707-7a8ddbbfcd04" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目经理岗位.ID" - } - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "8a4d64d0-40ec-4a14-9d57-d194e60f8420" - } - } - ] - } - ], - "ID": "cd32e974-50fd-4ee2-9489-c6b3e53f359a" - } - ], - "Comments": "这里将项目经理加入到项目成员中" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "是否存在项目分组", @@ -714,7 +779,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "b7b3372a3f6f4a18af8e0384f85457cc" + "ID": "fe33808fca154a3c915170ecabf82510" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -742,7 +807,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "项目ID", - "GUID": "caf212f7-a856-4ace-88c4-65bd3cafd2dd" + "GUID": "c6c5e3e1-46ab-4e2b-a1b7-f77561adf80f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -753,7 +818,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "分组名称", - "GUID": "7b981159-ebf6-4220-9494-8e3c15344bff" + "GUID": "65326a8f-88a2-4efc-8b6e-8e1df0292901" }, "Value": "调研阶段" }, @@ -761,7 +826,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "图标", - "GUID": "544b2aa7-1989-4b0c-b170-c22975a74033" + "GUID": "2a556768-ac98-4d81-a626-dd11a5dd965f" }, "Value": "📋" }, @@ -769,7 +834,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "排序", - "GUID": "d686bd1c-96ef-4872-947b-5dd26fad3fd4" + "GUID": "fdc45969-5017-47ce-a0bb-d71d35fb2121" }, "Value": "1" } @@ -785,7 +850,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "项目ID", - "GUID": "2f6d5b57-64c8-4140-8f12-a0c8247e0665" + "GUID": "9c0927a6-92af-4ff8-b3f0-efbd3f16aa9c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -796,7 +861,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "分组名称", - "GUID": "ab57b528-925e-4449-8006-3540efa12635" + "GUID": "80d9a249-7d89-4b9a-a883-b860aa37feab" }, "Value": "开发阶段" }, @@ -804,7 +869,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "图标", - "GUID": "f3e32e59-0fd4-4661-98cf-eafdd339e558" + "GUID": "903f39d7-a8d2-48ea-a8bd-f2d7fc254ab2" }, "Value": "👨‍💻" }, @@ -812,7 +877,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "排序", - "GUID": "52ca4fb7-66c8-4960-9ac2-8b044949dc08" + "GUID": "97e15541-84e8-45b3-9111-787b17e5f3d0" }, "Value": "2" } @@ -828,7 +893,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "项目ID", - "GUID": "161ed551-48bb-4630-a0e4-8cadff510b86" + "GUID": "a4ac5255-09ec-4d64-be2c-8d378fc05e69" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -839,7 +904,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "分组名称", - "GUID": "aab27274-3c1e-4f87-b114-c60d9a8d0b18" + "GUID": "5732db89-4c78-46ca-a93b-402d34c2c2a1" }, "Value": "上线阶段" }, @@ -847,7 +912,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "图标", - "GUID": "cd38cd04-108c-4be3-bc2f-2a0366210159" + "GUID": "791a0525-9934-4911-b8ad-6829a6189017" }, "Value": "🖥️" }, @@ -855,7 +920,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "排序", - "GUID": "afe491a9-bb57-42b9-b553-1352862e9a1a" + "GUID": "d99068dc-2b9d-47de-9515-f3e9f1f26746" }, "Value": "3" } @@ -871,7 +936,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "项目ID", - "GUID": "c74d730e-a5b0-47c0-83a2-5d7c8c8ac463" + "GUID": "c4b4ab11-60c8-4dfe-ade3-46be9fbcfd0e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -882,7 +947,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "分组名称", - "GUID": "f4523d3a-7980-4f4b-8d9f-a29e1eaa8cad" + "GUID": "b871146b-86b7-4f38-ab87-0e287d3711ff" }, "Value": "维护阶段" }, @@ -890,7 +955,7 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "图标", - "GUID": "dee24f08-0703-430e-8c8d-6345d7a30634" + "GUID": "b207ed22-1b77-4f29-b353-96bce2a8e569" }, "Value": "🛠️" }, @@ -898,14 +963,14 @@ "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "排序", - "GUID": "b0ce501d-55d4-49c8-a00f-5f8fbfeb2ac8" + "GUID": "b307e49d-200d-42b9-95ca-ba7e850c7244" }, "Value": "4" } ] } ], - "ID": "0c6bfa19-ed69-410c-8774-a996a6291510" + "ID": "130e9ad7-a9c4-4ae8-bd5a-d1f69f4a2846" } ], "Comments": "这里填充默认的四种任务分组" @@ -916,7 +981,7 @@ "Message": "已完成" } ], - "ID": "fbc97d07-2cfe-449c-b2af-8d23d0df910c" + "ID": "cfde9bc9-46b2-416c-ab77-e37be7539245" }, { "CommandList": [ @@ -926,12 +991,12 @@ "Message": "请先设置项目经理" } ], - "ID": "23ae011a-f715-4120-b77a-fd827e06a39e" + "ID": "0803b963-218b-4ad9-bdde-b526619bc19d" } ] } ], - "ID": "0ab5e411-bf4f-4f3f-acb2-d0707c682bff" + "ID": "38cf312f-c652-41c5-b2a3-fedf011d4b1e" } ] } diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index d316dccd..b977ceda 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -169,6 +169,34 @@ } }, "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "5bc8e5c3-9760-49c8-9197-0470e3833be8", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "商务经理" + } + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "5e41065c-b1e5-4857-a7c1-564329bf8d05", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "客服经理" + } + }, + "Value": "%CurrentUser.UserName%" } ], "RelationType": 1 @@ -225,6 +253,7 @@ "工期": 5, "已分配工时": 5, "已分配工时_总分配工时": 5, + "已消耗成本": 5, "开始时间": 5, "总分配工时": 5, "总核定工时": 5, @@ -244,8 +273,7 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5, - "已消耗成本": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -298,6 +326,7 @@ "工期": 5, "已分配工时": 5, "已分配工时_总分配工时": 5, + "已消耗成本": 5, "开始时间": 5, "总分配工时": 5, "总核定工时": 5, @@ -317,8 +346,7 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5, - "已消耗成本": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -371,6 +399,7 @@ "工期": 5, "已分配工时": 5, "已分配工时_总分配工时": 5, + "已消耗成本": 5, "开始时间": 5, "总分配工时": 5, "总核定工时": 5, @@ -390,8 +419,7 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5, - "已消耗成本": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index da3f6a5d..9dcf3982 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -17,6 +17,11 @@ "subTableName": "任务成员视图", "subColumnName": "项目ID", "relatedColumnName": "ID" + }, + { + "subTableName": "View_任务工时统计", + "subColumnName": "项目ID", + "relatedColumnName": "ID" } ] }, @@ -35,22 +40,6 @@ "Administrator" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "项目经理", - "filterType": 5 - } - }, - "dataPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { @@ -95,6 +84,24 @@ } }, "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "商务经理", + "GUID": "f8054a26-c9a4-4408-9936-86780193816d" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "客服经理", + "GUID": "fc396ba0-d8ed-43d3-ae81-7c702942acd1" + }, + "Value": "%CurrentUser.UserName%" } ], "RelationType": 1 @@ -160,8 +167,12 @@ "严格模式": 5, "公开": 5, "删除": 5, + "商务经理": 5, + "客服经理": 5, "工时分配方式": 5, + "已消耗成本": 5, "开启反馈收集": 5, + "成员数量": 5, "所属客户": 5, "所属客户部门": 5, "立项流程示例ID": 5, @@ -185,11 +196,10 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5, - "已消耗成本": 5, - "成员数量": 5 + "预算方案": 5 }, "subTableOperations": { + "View_任务工时统计": 5, "任务平行视图": 5, "任务成员视图": 5 }, @@ -211,8 +221,12 @@ "严格模式": 5, "公开": 5, "删除": 5, + "商务经理": 5, + "客服经理": 5, "工时分配方式": 5, + "已消耗成本": 5, "开启反馈收集": 5, + "成员数量": 5, "所属客户": 5, "所属客户部门": 5, "立项流程示例ID": 5, @@ -236,11 +250,10 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5, - "已消耗成本": 5, - "成员数量": 5 + "预算方案": 5 }, "subTableOperations": { + "View_任务工时统计": 5, "任务平行视图": 5, "任务成员视图": 5 }, @@ -262,8 +275,12 @@ "严格模式": 5, "公开": 5, "删除": 5, + "商务经理": 5, + "客服经理": 5, "工时分配方式": 5, + "已消耗成本": 5, "开启反馈收集": 5, + "成员数量": 5, "所属客户": 5, "所属客户部门": 5, "立项流程示例ID": 5, @@ -287,11 +304,10 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5, - "已消耗成本": 5, - "成员数量": 5 + "预算方案": 5 }, "subTableOperations": { + "View_任务工时统计": 5, "任务平行视图": 5, "任务成员视图": 5 }, @@ -351,6 +367,22 @@ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "HasChangeColumnType": true }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "商务经理", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "HasChangeColumnType": true + }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "客服经理", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "HasChangeColumnType": true + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -565,7 +597,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tMAX(cy.[成员数量]) AS 成员数量,\r\n p.[项目预算工时] AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x", + "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tMAX(cy.[成员数量]) AS 成员数量,\r\n p.[项目预算工时] AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x;", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [ diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index 05728e18..df98a9d8 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -224,7 +224,6 @@ "起始日期": 5 }, "subTableOperations": { - "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, @@ -288,7 +287,6 @@ "起始日期": 5 }, "subTableOperations": { - "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, @@ -352,7 +350,6 @@ "起始日期": 5 }, "subTableOperations": { - "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, @@ -425,6 +422,20 @@ "Name": "项目经理", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "商务经理", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "客服经理", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": "未分组", diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index c6ade154578d958d8c121a4390747ff2c0e37413..8f97f46e0984efec4a28e41bf0e145d6fd05ba9b 100644 GIT binary patch delta 4454 zcmc&%3v83u75;z!@89-+Y$p&H33lu}9O8FEYS>VTqOyq+lF=-JX(NPS@+1y~l*cL= zMn(f^8(NpS9i4cz<)O7q5Fi55k-fwyoti$@byG`ehY8ub!C>9GZW259{!R?3##&YF zEcu+{bI-l!+R@wlum@%c9Lt76ga(6z1_Ffo{e=2_gnGS%dOZDa_`AVY1TyDh*F@VQbt|K7D=vR|hGtj2}Mq6k;YYvzWnViO5#!U5L zRa9c~hw^F+q*9J;=0g_7%P5Szd8U_4W0=yJrFWJ20^z`{nW56sP_X>#<@mX$yu6}8 zmns*R-y2<06{!lew?-SABQ1-<>+cIJFX;%~Qxn{{Jo3%b#fw}0jpePiwQKK+E($b- z=Qq|Yi7cuOEV-|&wWP9q&YUqHu`wr``QZN}j@Vcr={N#kWE`=H2a=A%|3$@EG($H%?y+l|ly2 z3^@cFvY(HkojGLMwnADBl9@~6EbhUU_|C|2`XVuK|xmFiof#X67=6m z{9ngV--F*{pv3!W=!YM{)36KT=z9x%2RhOJSD{+sS>iu~@}R>;dBA1Wxzj?q-vv5% zYLxpNX3D+!Cdxf7qt2ab{QMa&xD@)cz$pkkt0?_9>sZIp4&L%Kzszxfx3JaoaR*s|{*LwEfx-v_7p{ z+n}}M7V@;1QY130!a|4(D410$8o~-DlZZjo7NkT&Sk0%RHNceylssJ>Kx3CK`q9{# z645wUH}(-@hpzUav0WFvXgpnHDv1{_s&jO;2i4gr(GZrWQIT;A)+{R73xxG$!I|Ok ztYC$8a!SQFbTza_qmlNtiLXT2*^?EkzQ7Dz%aRfe;l%bRyOGO<+2j`XPR4TXz_VHb zOJOlAf(0-S=E7_|lWUrd)MHW6gxYi#SMHX7LHMg&C1_giR$coU|6Hzs;-vhyTztN{B-nb`3dH$h^5jCIPI zM$X=BP7LF(DUw7pArh(|3=20HxY2K2HVTR7?FO?-)?wiztO8VC1v^7*1%Vu*3_}cj zhz;=yT*P)b48MXQbafCcqQWz1g(9lhTsIY^?m4cD}-c=fca(J0xtuV z3I$Hqs8k?GvYATxf+(A)lqU#@V^6_+K8Off67BaieZ z zYz=A|_zNDyYj7S@(~rQ~3*Uzx*nrSl3blA7Aw)Bm!6HyXfRFuKKoV5BsjQBMfX3yr zX{`9ooShv9gPYjtI4B@XA!2+Am&H;n6q>jkwxzzIm7vN?EOms=AeK$_%|#~8n8S_% z#WQfx&*fR101HUmZ^6rW4GqE(yrFl)pl-loru z^YBYJgDtclZ`A`B{$}_ZNu8QWX$DOrO{r`pGGYg*M4N+TCbCFhHKLKqH0=TfC@&|j z)^U?Q(G^rfCWq)16r#_gAVLz~I0b|T@+r+D6dyQ*ItlgB`w1U8D0}Js zgDWPWyA@kfN_Q&|Wult^HIb}24r`TI=$IRa9A1lPK~QcdaH9}WV3@SPe_*tK#%fzJ%e5ue8;mMvSu59bSG`Jh(iFN_6#N^oLFw7Y4N1yDubn=Inj~#8P huh2We#3{udG6f?ULsIf5JM`qOZ~WNN?5~!q{{#D%PzeA4 delta 1864 zcmah}Yiv|S6uxt3=050l&)rhm-PX{h_OZOXl&&S1(8NfLXtqD}r?#Mrtt{Q8&{_;h zn*bsup}-PJQ@XK(ud<8&o^Tm~++Va}S(&}(%dMf@+ zbxe_9nX||FeCju;vmN^!Q}DMbj<($A7EvutHl+EIJ~LJq%yR_%v*rYfO6K_kMWwNi zgO&e-r(&8HJ?bU61wGIKpTfJa4(c&@CB*7mHsfBe1b2dn1XKJ2_k( zCv^y}B5CKKm%B$V}a=!TPU2zJ6IL|X^uiBYofX@g=yIhsaSMQUDKU5CUv zWVB?W#o{lO;L4-vbY<1z<#j6snEw(`K+{A%s%mAWh@N3qm=qPgEK{oM0u+Y>5~`~o z&Iu)8M!O)C!tuR&q(tks#KyxehKqcCFur%lJT~L9cF|j9uB;7p@NP#X1{=i3(Kv2EVg?=Z|Z-G45P~gf# z0pJR5ov}m2uLWfz>I7BS9g3ExGOFnFk9Ek*`Si!IM`gbsb)pd_Rh)3mm;2q&w4C{ zR>3HAn_ow0nS(*6goQeR<+l@&9|yChkvd%l%_k3YPt7%r)NR