From f5f7b3a2f5a74b5b8cdeb3113a72c5710608945c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Fri, 21 Jun 2024 15:04:16 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 38 +-- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 +- Pages/任务/任务-基本信息.json | 320 ++++++++++++++++-- Pages/项目/项目成员详情.json | 65 +--- .../项目首页/项目首页-容器页面/任务列表.json | 66 ++-- 5 files changed, 354 insertions(+), 151 deletions(-) diff --git a/.collaboration b/.collaboration index c1f67f44..ed69c6c5 100644 --- a/.collaboration +++ b/.collaboration @@ -522,17 +522,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:03:41.1562142+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -568,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:00:09.7630772+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -704,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T14:58:34.1672241+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 7025d5e0..ff2efbfe 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "363f4248-0f06-4f22-b9b0-4c79008137f2" + "ID": "7bbc15e5-9723-43f2-b0e9-0855ebdb53d8" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ec3505fa-a2df-448e-9e6c-accad0068a62" + "ID": "5394bd4e-f3c1-4c2c-b6b7-110f55816864" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "25a5f661-21cb-46ec-af4b-4dfe7e28dd1b" + "ID": "d545ea15-018e-497c-9029-fcefa9050bc9" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "ffe4ea1b-31f9-4ccb-bdc7-9fd556228c6b" + "ID": "837f7d8f-02f1-4a32-9ee1-f951742fe849" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "b41c4c05-d30b-4d85-ad51-2b0dbb7a1c5c" + "ID": "bd3c5342-5e2f-4c60-8041-c266f3340fc0" } ] } ], - "ID": "55d5807b-6b45-40e9-a62a-f3fc1e63c6d8" + "ID": "7005d222-c1e5-46d8-aa55-4a37482fd8e3" } ] } ], - "ID": "d303ce6b-07ea-4981-b6d4-c4d993ec2348" + "ID": "4a171751-6333-4d5f-bb47-b3dc8f0ac92e" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//YO19iMyazAkh3fPP6AhX3UfRoEy55fkqwVtPPJpoCbSk2E1GWBQSsFbzOzoazyZDMEcmmzYpIQVkBqxzYakN9+lK9cSuMDNzHGSZC6p3qGDBU8XpTUkqyk+AAK4Vmk75rSb2J8jG+HS0/hPQ24Z62vncu63Ectlql3DYR9j3KPe3yFSruU3XCSUSGGixKANq1OEUHEfFlAblD7BZb5x3I89OcSvK2Lkryrdp02cmvLv/V3OGBhOmT6k6K1A+V56tY0ULZbJf/h/FpyzwcrekVn6mR2sGBodfGu+rJC6Nh9L4HmSSUT2AFu6Y/RofP2b+hs8aA61lHb0PUJQxRc1sLqWo89WnmdK7r9KeNj/Gp++qL7/MzxiDPT/vsLunfwLimUNUT3xlnt99MM74B9cxaJImXmaNMXW2hg64ws2cXaMLWEnzgEv6taMFwgJDnUwMHJVSAufDJ1lc1TN9SsJico3822SkfcUp0PTzXc9W5fJSEb8JnlSBmiWEiY4P8kis0lUE49Hf+iLVgHtz2AEJvvD1U+p/6u8EpzigsSJ3jwrpSr78y9cq3iAI9rYs2r5Nebq/i1hjuJrd6pcOGud5u2sJGfAb16FTsIItR2DqaLVh88u2x2Zzym/D4pe4qLxDGZlC7lD9as/dSpG7/DqJGgB7diwv3ik1InVetLID81P936Khx9djy1UhVnlPt1seU4tn4yAMV3zunOLcbbR3WZVJKqgcJUMdZblWK5HiCveuEiY+iiZnkWmp8K8d5FgoVWmc5aM2+MrMPTUuudEmT+l4CBLGDsmUTSG8BFfrmbT5Vo0YqcxEUsRgOvUgcSpWLThuHJKhd8GHSV1Jso3APBhW//5pr66GPOqg7cSbuAdr7B/tKHHFcFfXEfW3DS2Xn/m04HN5SX6zN3nI92cMUw==|920 \ No newline at end of file +}//USPbZQLEZHOe+DlxWBpfB1bKDmdjFqad1TM2/xaAOxWV4TQf6dNDw+SVeflr0+ow1tv8owSFmhUcs1uP8zM4PmVBB46GXdx7SC6aad0Q6CF3Dk4nA6/aNkbYnp8htfsSydAMpNDeXq0HSdqwzQl8518LUUQfcR6t2BZ2SEqwVhtZwmhB5nuKUsXpOO2tKeRyMoQeqljaX3o88KZMBqwpOnJkTFH/3NT5PbNGeylLDJVQjfFm3fmWKhs/hyUIZZjgu9TdkUgtHyq4XrDm0NhwgFoi50ep6lKz1+STehCerWyu3Xl7IwfcCLKlWvT2ANtAducy97STU/dJPZtxuIJPSEQxWwLR8CEii/+yjPPqB56CkSjq3zFa2nf0kUTnNTmDCIY1YVQl57jGp3BsirvTI3Q5kScQbRgdBwdBtqXLb43pyYuwnfGaEIz8x2arWDwjyQCCmy0XY0r9dKNjL3x8Vc/kyqAVVyNWpZ5BkE6XMOyZWL1Osu7e49OYv4PW1qvSnpM/k15G4O4ujZi7YLw8iBlBCYklT4fxgkzW0aacfvKBssjP+dE8SMJ2fTKtaCejzYOV4MViJ2KswDHrS7LXp3nt6yuJc0KVWby1nzf68uo5e2/mN3QXmSx5SUVlqKtt+plfX/tWoCyCzdpTqpqBj2qvKq98zdROUZH0faDzGdaSS0nCxXhXB6WUU+8T2qq6ckNQmBPphIitdI9lrgQXgORHTb6DvFUJ2V74NZTM1fTpPWO/TYyo079rwfNzOkJrF2QmNi1rdGZdMXzAT8R7vIRo6nGSFZIMdF/K8kjczrCaej7J1tA7uD8g1pXPfvs1xB4vA7m24R6yHE9nfahasWiDRh6Y9Pr3qd+oG1Vmsg/ygkLQ334Zrf29ZWNr3GlkaNyXCEs+X5TJp5vK6MEe5g==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index fb5f30f6..9f395bc4 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -989,7 +989,7 @@ "GUID": "8763325f-d288-4bac-9366-d259cad8164a" }, "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", + "$type": "ElementUI.CascaderCellType, ElementUI", "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1157,24 +1157,265 @@ "useBinding": true, "options": [ { - "value": "黄金糕", - "label": "黄金糕" + "$type": "ElementUI.TreeNode, ElementUI", + "value": "zhinan", + "label": "指南", + "children": [ + { + "value": "shejiyuanze", + "label": "设计原则", + "children": [ + { + "value": "yizhi", + "label": "一致" + }, + { + "value": "fankui", + "label": "反馈" + }, + { + "value": "xiaolv", + "label": "效率" + }, + { + "value": "kekong", + "label": "可控" + } + ] + }, + { + "value": "daohang", + "label": "导航", + "children": [ + { + "value": "cexiangdaohang", + "label": "侧向导航" + }, + { + "value": "dingbudaohang", + "label": "顶部导航" + } + ] + } + ] }, { - "value": "双皮奶", - "label": "双皮奶" + "$type": "ElementUI.TreeNode, ElementUI", + "value": "zujian", + "label": "组件", + "children": [ + { + "value": "basic", + "label": "Basic", + "children": [ + { + "value": "layout", + "label": "Layout 布局" + }, + { + "value": "color", + "label": "Color 色彩" + }, + { + "value": "typography", + "label": "Typography 字体" + }, + { + "value": "icon", + "label": "Icon 图标" + }, + { + "value": "button", + "label": "Button 按钮" + } + ] + }, + { + "value": "form", + "label": "Form", + "children": [ + { + "value": "radio", + "label": "Radio 单选框" + }, + { + "value": "checkbox", + "label": "Checkbox 多选框" + }, + { + "value": "input", + "label": "Input 输入框" + }, + { + "value": "input-number", + "label": "InputNumber 计数器" + }, + { + "value": "select", + "label": "Select 选择器" + }, + { + "value": "cascader", + "label": "Cascader 级联选择器" + }, + { + "value": "switch", + "label": "Switch 开关" + }, + { + "value": "slider", + "label": "Slider 滑块" + }, + { + "value": "time-picker", + "label": "TimePicker 时间选择器" + }, + { + "value": "date-picker", + "label": "DatePicker 日期选择器" + }, + { + "value": "datetime-picker", + "label": "DateTimePicker 日期时间选择器" + }, + { + "value": "upload", + "label": "Upload 上传" + }, + { + "value": "rate", + "label": "Rate 评分" + }, + { + "value": "form", + "label": "Form 表单" + } + ] + }, + { + "value": "data", + "label": "Data", + "children": [ + { + "value": "table", + "label": "Table 表格" + }, + { + "value": "tag", + "label": "Tag 标签" + }, + { + "value": "progress", + "label": "Progress 进度条" + }, + { + "value": "tree", + "label": "Tree 树形控件" + }, + { + "value": "pagination", + "label": "Pagination 分页" + }, + { + "value": "badge", + "label": "Badge 标记" + } + ] + }, + { + "value": "notice", + "label": "Notice", + "children": [ + { + "value": "alert", + "label": "Alert 警告" + }, + { + "value": "loading", + "label": "Loading 加载" + }, + { + "value": "message", + "label": "Message 消息提示" + }, + { + "value": "message-box", + "label": "MessageBox 弹框" + }, + { + "value": "notification", + "label": "Notification 通知" + } + ] + }, + { + "value": "navigation", + "label": "Navigation", + "children": [ + { + "value": "menu", + "label": "NavMenu 导航菜单" + }, + { + "value": "tabs", + "label": "Tabs 标签页" + }, + { + "value": "breadcrumb", + "label": "Breadcrumb 面包屑" + }, + { + "value": "dropdown", + "label": "Dropdown 下拉菜单" + }, + { + "value": "steps", + "label": "Steps 步骤条" + } + ] + }, + { + "value": "others", + "label": "Others", + "children": [ + { + "value": "dialog", + "label": "Dialog 对话框" + }, + { + "value": "tooltip", + "label": "Tooltip 文字提示" + }, + { + "value": "popover", + "label": "Popover 弹出框" + }, + { + "value": "card", + "label": "Card 卡片" + }, + { + "value": "carousel", + "label": "Carousel 走马灯" + }, + { + "value": "collapse", + "label": "Collapse 折叠面板" + } + ] + } + ] }, { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" + "$type": "ElementUI.TreeNode, ElementUI", + "value": "ziyuan", + "label": "资源", + "children": [ + { + "value": "jiaohu", + "label": "组件交互文档" + } + ] } ], "bindingOptions": { @@ -1182,7 +1423,7 @@ "TableName": "任务表", "BindingInfos": [ { - "GUID": "775b0c1f-d625-4d9d-b0b0-2ed3d92dc203", + "GUID": "ab7cf1bf-f636-41b6-942a-63cf0289ebca", "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -1191,13 +1432,22 @@ "ColumnName": "value" }, { - "GUID": "e930fe81-e619-4613-82a3-d4deef55d62f", + "GUID": "2a6f28da-2c7d-4669-b484-ddba3b7c0d94", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", "GUID": "a123bac7-2d23-415e-beda-f3a5dd915931" }, "ColumnName": "label" + }, + { + "GUID": "6ffbb993-13d3-49e7-8cea-9aaffbd7cbec", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "f95d1df7-ac21-486d-bd33-7bfccf609ed5" + }, + "ColumnName": "parentValue" } ], "SqlCondition": { @@ -1212,17 +1462,21 @@ "SerializeProperty": "='任务-基本信息'!项目ID" } }, + "TreeSourceSetting": { + "IdColumn": "value", + "PidColumn": "parentValue", + "QueryResultMode": 2 + }, "CustomColumns": [] }, - "placeholder": "选择父任务", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - }, - "DataValidationInfo": {} + "expandTrigger": 1, + "placeholder": "请选择", + "separator": "/", + "tagType": "info", + "checkStrictly": true, + "filterable": true, + "clearable": true + } }, "9,2": { "BindingInfo": { @@ -1950,12 +2204,6 @@ "7,9": 5, "7,10": 7, "7,11": 5, - "7,12": 5, - "7,13": 5, - "7,14": 5, - "7,15": 5, - "7,16": 5, - "7,17": 5, "7,18": 8, "7,19": 9, "8,0": 5, @@ -2039,12 +2287,12 @@ "5,11,1,7", "3,11,1,7", "7,2,1,7", - "7,11,1,7", "11,2,1,7", "11,11,1,7", "9,2,1,7", "9,11,1,7", - "1,20,11,1" + "1,20,11,1", + "7,11,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2074,7 +2322,7 @@ } } ], - "ID": "53e0791f-6a5a-44de-a99a-5eb97d872dfb" + "ID": "4f245875-8fdc-43f9-8175-917c62819cfc" } ] } @@ -2229,4 +2477,4 @@ "Formula": "'任务-基本信息'!$C$12" } ] -}//HGz2qPuXHF2U2qKr2tmDOOKr9tcLNn3ktNxMo333jjgqOEKkHiVmVG+H2OZcPXJsqZ6Df76C/SOc8BfhCfKS+bmYV/Ab92X6/V5GFfGaSs4HVke3eweH9fJ0vOEtec4nWH0xAJZbW5XwxrvS194GSj9ReVeTnVyWouosHy3wm4BSO3msux+ErBvBhkysYklyNFxmO/QNZAv+OezYYW9NcfQ60tVROui31tZuLgT42oLswsrLEy1qSWC5lwud6t5p8VFY3HtgspG/ZXF1Z77rvbikiiWlV6IeMbCSNbS4YzDCfM+Xbs2NPNdvtb3e7N0USz+zsfzs4b9n7kiYMxK4aTDA2lGMrg+I0mLuWzCmpuXe9/gLj2iQ5Dn4Y+ZpH5N//zGpWlOTSTnKiutyKLIpRi3e9B4AOq9Y0ZczMG3NqxGOo43dMwKoKmQjIOMxdajWxbjKis7sw4Y9o3xcY1qP1cJka7UvjjF7QYnIpVfd1mvOyqgc5kBEuReKpITEqO4KickGKD3+LBCP4Ft+73D8ijTIQaKIODixdmoDi+ev33Aw/GILutKCyDMzOxdx1zCYIPcOv0HkvxQ3nth5QLRqPUIFGYT0SNxLFUz6Iu+/KIX2xs3XRRbeEKMkVZm3AtBEqYDeyouzCMSzMg/T/I2/3R3n1W7xgLKbuuXURYqTKsqb7qIjHWR/eeFPmaYg94x2hafDXggpdOJskp2/5jF3UG4ik48pXDbj6bxhB6xhSP3zdESkmH2Mu8IwS3B3HqpJUf4DRKaE1dkOybotTp+jzwEkMDjf/aJFi2F51TTP2V8nCtgUKcf3RST6+sc81D+sFxwRScG+VBxyi+B6LwLAPtul9dQzZ+hWrnEFMB+tY+8xkXQ/yGXev5z2ct8FFCgnxxG2rFomoqjIQcdB/QRvPg==|920 \ No newline at end of file +}//Oimuu6NO3v4I1uOi/12C3qaFGef0NrE60esjkicsBbsNixnWbc6vDPIKB29WOPOpiyGWV4IXVIiCdVRfoOuidc4BlUd6nVa3gliaFMu0kxL09TPtJb/WDbSRcm5eZv8BmjHmElJUo2ktWF5xpIpVpH4YovGx6N3T0il0cSVb9buRXUSlOBE1/8iGSPIgjlcV0/5ZPwp6iXAV2ng5NlhJClKawBFh+ENQHLHO4kbnB+M9qOo0S33ZaldnlbLt8vx7p5od2lBDH8AiaZ+TL73DJDGf/6PLyDbT+y6UsGzT3OcRk3dk+1vhn/2GjRYfATBPdyYTksbPIn7dhgHC0p9ypG5MaeIC9qTxi/ubMoiU3IReBaF9+yAw8zsP9ty++qyCjyNhbzYwZX/jakhjB4zEePoxPhgHxolrIr93J5GKCzDeSlWXa12EvN61978cYHMRumFjuwYj/KwU5s5yVHfFHQPkv3XZNUlTACjqvrC+vO71f4Is+p9Qhp12BJNqsSwpJ57f9SvX+CWkQzFpwOimjw4EJ698deyXgUezd3R7Q8H+1YFW61y3l5Qadk89wXs5w8+X/sFKKyjgBsKUGbNw33fTtm5DOl1HIuAysoZ/bo/te7bSXlJSzVE0Lyj2VQZ7GjOeSoTobiZYFBcAndSCicipyEJoSgroXPuFPWWdTn7HviTyipqmdWdyHEOaNP/zgL3w9aETdldRw5puYZLmxerYUJpqbM5p2cOWWMjNFnW3E5JE7LUkHrmiUinAuJP6cP0mVKmcz8KCQ2SoQan1gdJcnnn8T2yl4ly2e+pRne33NWp9ZtF/fWlEM0d4hKZCtdFzDVh61JUTAZWDP9VMJ1fXudpTPoD1rmQGvCUVQlO9mWEcp+FJNECf0qrT72rZoi6VVwDLCDUB/bVCKgTR+w==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index c64707ec..d7991e29 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -255,10 +255,7 @@ }, "DataValidationInfo": { "IgnoreBlank": false - }, - "RulesGuidList": [ - "e3b0f7dd-9e6d-4807-ad47-eb02ebbce0be" - ] + } }, "5,1": { "BindingInfo": { @@ -436,17 +433,17 @@ ] } ], - "ID": "23e37a20-d547-42c3-8ac7-85c6a426ab4d" + "ID": "a3cfb99a-b271-4df8-9e26-a7bb679b93a3" } ] } ], - "ID": "d86e289c-8833-4889-82d2-2e167bd3eba0" + "ID": "3f4bffe9-5247-4fcd-b52f-eb0348f63501" } ] } ], - "ID": "186d402d-216b-4bee-8704-0937ed990a37" + "ID": "a052463c-39a7-4a4c-bd42-040d4591631f" } ] } @@ -535,10 +532,7 @@ }, "DataValidationInfo": { "IgnoreBlank": false - }, - "RulesGuidList": [ - "73cb25ad-6c05-48cd-84e5-b28c2dd119b0" - ] + } }, "11,1": { "BindingInfo": { @@ -664,7 +658,7 @@ ] } ], - "ID": "5af2164b-96a5-4810-a1ec-c3ff3ebd9840" + "ID": "4af62953-38b2-4ceb-b0ac-d38f408319f5" }, { "CommandList": [ @@ -674,12 +668,12 @@ "Message": "请不要重复添加成员" } ], - "ID": "6185053c-0982-4797-b4dc-14b579ca7313" + "ID": "915e74eb-ed50-4ba8-8b9c-a00841134042" } ] } ], - "ID": "a5759e29-407d-4a98-b3d2-9075bb004262" + "ID": "969d3dcb-f245-4a2c-bdb9-3ce384bc077f" }, { "CommandList": [ @@ -689,7 +683,7 @@ "ShowConfirm": false } ], - "ID": "156e9190-e44d-4184-aa7f-5230e65f6f1a" + "ID": "a10a5d36-b082-46cf-9215-d2df05cf7870" } ] }, @@ -711,7 +705,7 @@ ] } ], - "ID": "7fd353da-f007-4404-b494-e03948a52089" + "ID": "98599c88-c31e-409d-b773-16cd15e4e9cd" }, { "CommandList": [ @@ -721,7 +715,7 @@ "Message": "请指定项目" } ], - "ID": "3a8e364e-7dc1-4376-ab74-15fd64454a63" + "ID": "6fad716c-82fc-4eca-ab31-bee07532647a" } ] } @@ -971,40 +965,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目成员表", - "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!$B$3=项目成员详情!$L$17" - }, - "Priority": 1, - "GUID": "73cb25ad-6c05-48cd-84e5-b28c2dd119b0", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!$B$3=项目成员详情!$L$17" - }, - "GUID": "e3b0f7dd-9e6d-4807-ad47-eb02ebbce0be", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true, - "IsInvisible": false, - "IsReadOnly": false - } - ] - } + "RelatedDataTableName": "项目成员表" }, "PrintInfo": { "PaperSize": {}, @@ -1024,4 +985,4 @@ "Formula": "项目成员详情!$E$17" } ] -}//Lt2xtp3SRLptemXLBM6YLklmT2DVHUFRUl1pZn9m941Mee10P/c3X38VuuoJLwYOVH0gWx33LXQl+HUOMo4xieQt4OJxqzcjVY0jmvCDrQFyjYTp2zNJt8tx+rnSM4bU7JiZvbpMcWW1SOIUgQEX8gekI0cksEV9V+qMOYg3l8mvNANVtK0BNmpBeJ/N37vd7LobBJRjgjgBK37j5qIqE6LVNslo7v7m2F7W/qSuqopQgVOmGoVyXejf/5eRqSoodh5d0dLlO2XAYRoPGNdrhEROBpeYRbrTlG3h1Nx5nwiofrqkVYw48VXyMuKXP6snFQfj9mBOvP3Tj/AkjMkFbseSqKmBEatUvCFMgIMPeRaPqse5mtSNg4VU4GfWnFjbKeUjh72pdbU1iglVZPemRxecrRpVO99D0OiOUUnJaCZooN+3AWRVIAJJkZsz7u5busP4xmqt5BTneN0hWudBqnV08SrwNWNkO68GQtDFGq/F4bA9cCyFheXY74Xh1JYjUwk641fS2n56lTbXY6Vq0TnqegOn6p0ShPMqKPu/Gnn+kLvyVunyF042cM++JY9SrLlkdZJvlqMr0R+uvMAGkb2EsmzhQLooTEeurxs2l79wE3N6XLwbWqqEqvOA23WRiSvVrXum9cIjpfWEt66wwqkL2AvfKW4IYxF+vXPFEF/wkqFLJImvpG3R2oqQHol6zO2dMw+A55ooUKvmXrVyjAuHhe4jad9dgPSlG2TfJzc8eF/fvqKu3A7+AllOVboDSo4nkzSl4ZjXr7VQ8g5zPN33I8xQmkLSZlIdlMrg6Gr0tDZp3q0OgXMHNiisdgpX0i5pInC2POcs0hizhBbRj/5bMZVvMCO8v27paR4iGVK/ZrsD+xPW9jdp0D8bnmPnyyJ9zb1tvJccHpELWpGzbA==|920 \ No newline at end of file +}//w1o5z8QGA831HQzoIATK11poxKozy3N+W2YsZ42STFz9IRio/yk53y8QX0xiWMuRWMrr3qremj16tQ70DI9VMtDJnX3ZtjsZSq/1DWmUte3uqchWfgzxxD4WxcBDbJEP6lhTcOoQP0HYfiHWl4Wt0TB+i8wpjevy+qwav18nlUw2YDWWTpXX0aSONq6Y0xJavLxpTHDye1baS4P+2Bc2OEuzG0eMYEzrY+uV2TRV45ibwvf5mo2BTh03/o9xN+TlnFulmfkjoq2P/GDgxnqAkq5Gs2rV1g08mZpMQfmhGh7QqNPk0EhJqKkBzNpij0DoKpq/sOYQrOPdvy61FrKbvCCXJCjvrkbIrK4hg4kUIZB13JwsWsxxO90nJnzhmXcm4eDsRUDCVlFlsrkjxWYrFMGaTDmR8ctKex3iO3ReK3NQLjKih+pLd5lgZ5QaeTZSAqi7XThqm5cI5xz9996+dY/Q6cvZrfy1L1QWiWQs8sxSTKALYAuBwumeHp6o2E7LPimOQF+kTdPn32CS0lrv8K6gRbTFIhntSZyyiu3LfZ/hNcibXe2wEfp6S3qk+brozq6sKJcfoaFK8uw6+28vmn2BHePxH4PcLP3ULGkICxBfxji9IURANSfxFqe5M4IbTo3NcWp0LytSs7gz8bRlq9GhvbF2ef6E2FvxZIg5AQxVnD8hbOxob0sNESAIS6vsAEPFnaXR5LKIm/K2Khkx3JByMwc4+PgyGqToAhMNmkoaR9R3x8/AvTMxfwISRukCaOEnYZc2q7lm2zhailhLb+aB6eTWcp/iJhMRuzFaLIk95upOnStjLvC+olpCraXpCA7reNCCm17rpy5FBW1tFxXz/wh9WB5mBD3/fqWsbbHLs8hutbeD4w6hMJv8BFXnA3IVLI3tqUIVWZOEI1aeKA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 814c6121..a707e657 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f71c94ae-010b-4c3d-bc5e-6dd50958d3d0" + "ID": "e64b8127-5f6c-4e67-87e5-ee8e787e6094" }, { "Condition": { @@ -529,7 +529,7 @@ ] } ], - "ID": "f81cf588-b8db-4705-92fd-3cc1fcb2df74" + "ID": "0d054834-c864-44a5-9498-75ad33883725" }, { "CommandList": [ @@ -620,12 +620,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "4aca30e9-4578-4f6e-a0a8-9de9765c978c" + "ID": "d5debc27-bbc0-413a-8c83-f974ff50029f" } ] } ], - "ID": "8496f60e-010c-4b57-92ab-3aa855f494c0" + "ID": "33855eb8-0073-41c3-a19a-e7a81e19e97b" }, { "CommandList": [ @@ -640,12 +640,12 @@ "BtnText": "知道了" } ], - "ID": "553f9ee0-90e7-448b-94ea-3185c417541e" + "ID": "31c264f2-33d5-4ab9-861c-57162db4a976" } ] } ], - "ID": "772d53b7-da5b-45be-9166-c2278dfb1af3" + "ID": "8bb5f23b-5dc9-48b4-b72b-4d79828a46a6" } ] } @@ -842,7 +842,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "e2370d2d-25e8-432d-871f-72c15d39d495", + "GUID": "eb8e99e0-3096-4a65-b200-e75e55c96ade", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -851,7 +851,7 @@ "ColumnName": "value" }, { - "GUID": "c406a1c2-fdf3-4465-b517-5f9c8a3dbee6", + "GUID": "e474c331-7ed9-4df6-a5e1-9d832250e5b2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -860,7 +860,7 @@ "ColumnName": "parentValue" }, { - "GUID": "64e866ed-b4f5-4f0e-9eac-d5be0f3c7963", + "GUID": "36b881eb-403f-4021-ae50-9562109e4ea7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -874,7 +874,7 @@ "ColumnName": "状态" }, { - "GUID": "74e90e08-ed97-4f46-b84f-d532be4b10f7", + "GUID": "6db2db95-1473-457d-974d-4575d8827228", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -883,7 +883,7 @@ "ColumnName": "任务名称" }, { - "GUID": "87a49a06-37af-4927-a38f-ef899eeff696", + "GUID": "ce3b2943-e2dd-470f-b9fa-17277446f0fe", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -896,7 +896,7 @@ "ColumnName": "执行者" }, { - "GUID": "c62dabad-5ed2-476f-8900-13b11082a9ac", + "GUID": "29b423ed-d4f8-4877-a1dd-3608783ded66", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -905,7 +905,7 @@ "ColumnName": "开始时间" }, { - "GUID": "3abba67a-cebe-4049-9942-c7a86e02421a", + "GUID": "23d6863b-ce04-4dfb-b6d1-e0226f470ca2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -914,7 +914,7 @@ "ColumnName": "结束时间" }, { - "GUID": "534a7107-43fd-46d5-be78-db032339ea23", + "GUID": "1b19befb-b40e-4af8-a159-44f27a18ccf0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -923,7 +923,7 @@ "ColumnName": "总计划" }, { - "GUID": "d255211e-f6db-4254-a7b7-a5927e6e9067", + "GUID": "50809d5f-9f68-4613-8e58-db7b29e10ace", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "动态可核定工时", @@ -932,7 +932,7 @@ "ColumnName": "剩余" }, { - "GUID": "7d3089d9-b27e-4d84-94f3-bbcebf2c4eb9", + "GUID": "5b0b2454-68b9-44cb-91ed-ff0fabe5f7c8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", @@ -1182,7 +1182,33 @@ "LoadBindingDataOption": 1 } ], - "ID": "96abde87-9199-46d9-bb22-a8e0c6d286e2" + "ID": "d764697d-bf08-42ad-985e-28abac497519" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "d8ff18bd-467c-4a19-94c9-8a5e5b252b3e" + } + }, + "value": "3", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务处于\"&任务列表!行数据.状态&\"状态，不可报工！\"" + } + } + ], + "ID": "98c2baae-a4cd-4f51-97d2-a2ad5082a8e2" }, { "CommandList": [ @@ -1221,12 +1247,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "322b9310-649b-4b6b-8a1c-04725acf201c" + "ID": "e0a60995-b2f6-4d2f-8940-69e8eddc4760" } ] } ], - "ID": "f3e69757-b3f6-4d2e-8c94-d9a265283c8c" + "ID": "29624ed2-bf10-481e-a369-2bc5ba06f926" } ] } @@ -1619,4 +1645,4 @@ "Formula": "任务列表!$K$6" } ] -}//+I9k+q5uoLJfH4B5cns+TI+sAjiTNAhFhwzDiwFoT1l6a3eyXXX2GhwN/OgynyVnWMAq0kwWzzwbFTJ18nsXx3exPE86qYIHSL+zdINHGS3vPLv1K+2I5VNH5npf2DZUdEPRu1lcz4OUFo0dW9d6GH9k0cLhJ2s0VB1uqK7L7GSGqLatNDTCCBytJ2n4iPfr9Z/02rMtvMEYdm430q6DKx+SdbHzuI0hRVaHitQun66yEGWJqHZKQukyxKEuKS7POiRolfSVn92pARzOCliNs7aNqdUAWvkWKxNuq3CYsgglU0H0ByQnf8t67iVcQWyMQ2y6T9z6EQ6eN6tXo0avDDIFgBU/az8/Ounj4SE8gjcmBRxu1x/AcF/y1csIjxFYUp669qV7U98Z1TSnflrIdy7kiIbzo3uS9Pw8skryEAa17Ign7/GolS2RbOY01JMB0GjgxYaS2w41v8amZVvPSS5IH4FuZnK2v7J5nCnS2Fa+v+AYXBH5ARjY/CDtuTQUsTtHG0qI6vzaZVN9QXwrpXafrQhz5dh9WkRoarpHldxM1CN/QLpab5h6xdtWaxG+HfUEdGKOyacumkDWS75qtA1NzHfKSXlqI4Bm7Rm01RNXYVn96sfe0+VD3i4KTijiEW5kJ9XBjDb1ywkyUdhj1v+BFOEsA1w707kEuB1g769iIWPd4drrbVc37incOK+ZZdf0laVCK0olt4uVrbksOKrPCwPesAdPFE04OhIUz5QYv6ChKf5tVunMyIfPkU5f1DZJZi2k8V6b0GhjmeKB0wL+Bfj/VXFZ9fAbsDmPyii9ZuObwxXb+gpV/Gzm2oDPL6G8ejfnqvKhpB9Oiw5uy52QsjgjgA0KQak2zkfz3KRHEq2pOetz+eUHT3u9NNc5XvSlGUR+ld56JiZqcrUr7A==|920 \ No newline at end of file +}//7eim8fiuJL0ndNXVGgCMEkg4dRzcoQZ5yzHgmswn/wjPRihIeSBavlHGTaGUTdSSTl/F4VjmUbhQXhye036GSINDakXvsT4V3kR3QGKIdX//x6zYhrHrR2Uut6F3J5L3FRVdYMe59k/Dj6F8oztjoxiyUh/pPbv/+R5rUMZ97X9iueethn2Fw6Bs0Bel0QSRp5KxBeLHpR3EbBf/UojN260Z58xwRqMFgqA7lOJ+nOugnMOPt30ROvewI0Ft+lojjnGNRtxBo59MRo18aUsmxISzVEDRVlagBVgkIV/01r8qgNTus4nLU4q+KOlfoAtqIjevHfbLL2IVryAif+vCux8t99ybvoXLPclNtL4FoCx1vHs3aFG8seOTnpasJT64EzRzb++oA2YZJPi+hEei4jt3rETQxZg7WmbOO3drksos12axoLeHkMU138G/0ixhGVitxyWb204+SIGOTRMcHGQXSJnKSouHldfGDSnX9HEwfNCyplv3CfMVJgLW1QnmkVCz4hLM+1Lt2NX36PXc57IVnfN6oPRy1+HNFGMYVwC6u+m4q4zMsB6To/kcasV2xxYDXE/nBS+Ff1Tyr7S087pHsk6BhKAwIzz9HeXBA0UwMHSXPWWNePT0kKwJBJWlJCCRUcF6TekNMMk56G7j7VE5AS9U0BvCKnKOu4MrAqafoKu+xRRp4avaj68gHf+jTfU0ZOYoBjYvO767wJe2JLxr1LtvqwjvRDyZRGMwpx5Fbys1G+S/TbVirIpz6xgEPPrPjBEMxsY1aVCVwxQkIEA6eHihbp9IKO2YB/qOcSWz5SzaAZ666PldtP6sM+Ge2tHYhvtwfL9InkEXuM8qaVj4NweC005l9ZimeYZUvrSIeXjH50xPBmtZpkf0VSZ1fYOkpBc6d4/uaoD9A2trZw==|920 \ No newline at end of file