{"Message":"完善工时新增逻辑\r\n完善任务新增逻辑\r\n完善任务首页信息\r\n新增报工确认页面","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/FGC_订单记录","ExclusiveType":0},{"State":1,"Type":7,"Name":"Table/FGC_订单明细表","ExclusiveType":0},{"State":1,"Type":7,"Name":"Table/FGC_商品表","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/用户信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/用户组织关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/用户角色关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/组织信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/组织级别视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色分类关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色拥有权限视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色组织关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/反馈收集任务匿名视图"},{"State":1,"Type":7,"Name":"Table/message_test","ExclusiveType":0},{"State":4,"Type":1,"Name":"PCPage/项目岗位详情"},{"State":1,"Type":1,"Name":"PCPage/项目标题"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目成员"},{"State":1,"Type":1,"Name":"PCPage/项目岗位配置"},{"State":2,"Type":1,"Name":"PCPage/项目配置首页"},{"State":1,"Type":1,"Name":"PCPage/项目预算申请历史"},{"State":1,"Type":1,"Name":"PCPage/反馈与建议"},{"State":1,"Type":1,"Name":"PCPage/任务部分"},{"State":1,"Type":1,"Name":"PCPage/任务-基本信息"},{"State":1,"Type":1,"Name":"PCPage/任务-任务信息"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/新增任务"},{"State":1,"Type":1,"Name":"PCPage/参与成员管理"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":15,"Name":"ServerCommand/新增任务"},{"State":1,"Type":15,"Name":"ServerCommand/更新任务参与人"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":26,"Name":"Upload"},{"State":3,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":3,"Type":15,"Name":"ServerCommand/上报实际工时(备份)"},{"State":3,"Type":1,"Name":"PCPage/核定确认"},{"State":3,"Type":7,"Name":"Table/素材库"},{"State":3,"Type":1,"Name":"PCPage/素材库_详情页面"},{"State":3,"Type":1,"Name":"PCPage/素材库_列表页面"},{"State":3,"Type":1,"Name":"PCPage/任务-反馈"}],"Version":"v1"}

2024-06-11 20:58:29 +08:00
parent 675147f5c3
commit 9961154b61
45 changed files with 7559 additions and 2852 deletions
--- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
@@ -469,7 +469,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "7effcff2-ff3d-422b-aebf-6212de110806"
+                "ID": "4960ff3c-7438-4ab2-a17f-6fda4c5eadf2"
              },
              {
                "Condition": {
@@ -503,7 +503,7 @@
                    ]
                  }
                ],
-                "ID": "9b6eedf3-dee0-4bef-9ddd-65767dfffd27"
+                "ID": "063509c3-9bb1-47a3-a3b4-04ee24cb1ea3"
              },
              {
                "CommandList": [
@@ -523,7 +523,7 @@
                    ]
                  }
                ],
-                "ID": "0ca1675b-5ffe-4a2e-8283-7f3b57e14eea"
+                "ID": "6892174a-f5c4-480b-9b49-e2e99cfc6fa7"
              }
            ]
          }
@@ -925,32 +925,104 @@
            {
              "$type": "ElementUI.VirtualizedTableActionButton, ElementUI",
              "Type": "button",
-              "Name": "打开",
+              "Name": "报工",
+              "StyleType": "Accent 1 0",
              "Shape": "default",
              "Commands": {
                "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
                "Commands": [
                  {
-                    "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-                    "Title": "加载中"
+                    "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+                    "CurrentRowInfo": {
+                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                      "ColumnBindingInfo": {
+                        "TableName": "任务表",
+                        "ColumnName": "ID",
+                        "GUID": "6174715e-228b-4056-92c8-0155f6b8c0bb"
+                      },
+                      "Value": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=任务列表!行数据.value"
+                      }
+                    }
                  },
                  {
-                    "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
-                    "ShareCommandContainerRefer": {
-                      "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8"
-                    },
-                    "Params": [
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
                      {
-                        "ParamReferObject": {
-                          "ParamID": "6a721307-5546-48b1-944e-d04195469758",
-                          "ShareCommandContainerReferObject": {
-                            "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8"
-                          }
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                            "tableData": {
+                              "TableName": "任务表",
+                              "ColumnName": "参与人数",
+                              "GUID": "75fdd164-bc06-498e-aa25-6a7cfeeffcd5"
+                            }
+                          },
+                          "value": "0",
+                          "compareType": 2
                        },
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=任务列表!行数据.value"
-                        }
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                            "PageName": "新增报工",
+                            "PassValues": [
+                              {
+                                "Source": "实际",
+                                "TargetCell": {
+                                  "SerializeProperty": "=新增报工!工时类型"
+                                }
+                              }
+                            ],
+                            "LoadBindingDataOption": 1
+                          }
+                        ],
+                        "ID": "d0d16dbc-1990-42c5-8f75-62e4e085ad09"
+                      },
+                      {
+                        "CommandList": [
+                          {
+                            "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+                            "Title": "提示",
+                            "Message": "该任务尚未添加成员，是否立即添加？",
+                            "Type": "warning",
+                            "ConfirmButtonText": "确定",
+                            "ShowCancelButton": true,
+                            "CancelButtonText": "取消",
+                            "ShowClose": false,
+                            "DialogResult": "按钮结果",
+                            "AdvancedSettings": {}
+                          },
+                          {
+                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                            "ConditionAndCommandPairList": [
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "=任务列表!按钮结果"
+                                      }
+                                    ]
+                                  },
+                                  "value": "confirm"
+                                },
+                                "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                                    "PageName": "参与成员管理",
+                                    "LoadBindingDataOption": 1
+                                  }
+                                ],
+                                "ID": "db075cc5-07fa-4124-9ead-6a870020079f"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "720ba038-bc85-449a-b4a7-c1741b10011f"
                      }
                    ]
                  }
@@ -963,7 +1035,7 @@
          ],
          "Label": "操作",
          "Width": 120,
-          "Align": "center",
+          "Align": "right",
          "Fixed": "right",
          "HeaderAlign": "center"
        }
@@ -1264,4 +1336,4 @@
      "Formula": "任务列表!$B$4"
    }
  ]
-}//SjGTDaUXzIeXfOzip+igsl70O7mNGu2WXxSkzvYO+m7hMhDo+JaVjJ4QSZacwEU9g4bpDEWl140hGzQs9/24DFcaX0yYftYmspYrw4u9pX0PMkrUnywei746IcYC+pn64v75hGoA9j0KL67Lm8fG/ZwYoMMWwTWi9pXgY93OAct2Ja3tJyLTSV/8cc1i41vaKlb/tFdyqUmzSbi82cFld4d//UawzMROEdWX48ntdr6c9b6xYeEJCBt5rjSBeuArZglipxbTibWPiLCT/EQ7tEjqLS9TbxuGq01Ip+jeZVoHFDGVlEtFybTy3pGm+K0PQpNr7wGH3FuTofgUoXoWxq7elwBeXb40bnAfYZDOU3nrN7IU9VkKVlf5sjYdTj6hHf+WGZ7EA+wpnStwWw4OvlDXR9ZxzZpNiniwwpjGGFVEHuNXxmel1HA42cCA91OrDN5Lap2GFur6UG3r/zGrwcN6vB5s9lrV/oLx/McokHFVKerye4fuKGf2HXfrXKbUOEPsXJb76mrpX0UTMqPbI/AZa+R6tbuFTMPpbd50dhD9TpTVyU1eUk7KB+/3cpe1sZE4YpOSfVCieVbaReffh0MmdguEgsB213172HJWekUFAbpijvoaPN23FEIGYxFrdl8mDPMzzItcFr055/otS0HIXeyZGFOQLBLBCG5fSwlBYjR81BL7OuWdfjI3DMNB02Xoa2+Km4QwLPCqOUJjOOKEUGPoh2Zqzq2+1DKfcrR0oCv96PsZsIfSV+/xHB5vdvz6c46kd4fRxd9BN9aLn4U9zYyO0fYlAy9liaGYlxBwVf4uX+bzBW1nJt18ItdroX2xa0dMfgb6ln5rRGaFg1wcVj85vMlIJgL7USSJZJPdQMN/4RmImhExaH1DTA1CzoRcr8j4XCLG0icNaiKiYQ==|920
+}//qwn3d2TzB3/LfZ6FVuFuJMTIqJQKvrwk/mqv9X497fuuamMWnmSGryYRV5Z68DgiQPYtf4cu5WTTqXi1JwrAINtpO8tUvtJTnAADuF6BncM8S2rgoqdqlzt04y7mkln6SnYi+K8sJdgnxnl7UNfkpNZ3DVtjtLlwbJoUf9qTz1Rb80tzmhGSkAwHSH22a2A02JKH2sZMrJ8ZrryeuE/38ccZJXxaSKgGQ9Ia+pWk+ehP34kDyaNL3hsucBbCr6BK1ELwVEBwbsImqp7UJ30VSoQVesaI9gXp81ySEE9xkPynaoH0bpTy3rJowat8/TiIB+qzOjGzq3o9MyGgnds/2z/cPLXLUzCEUQU7pN6upTmelrqff/oS0/PfUAR/SNUO3u2Elh2XcIKeINCVoga/yDx8BtXDloui5wp2Iej04q3Z9yRfzI31Djp/2PcWW5Y9lKFjUDDWna23KbIIzLp2yPlEBE99B9ga61pRKBzkhyZBJ4WhaIoaGbaqznW7QRFEc98JaQE7lb+csRreR8nYaloaZL0IBT/shhtFtsxUGLe8JKCOaFb94YYk/UsmIsGjGTKT/WPElyWBKbzhWvXY8yXX8Ckiq5tnx1Yu1tw2oZRmJBfgzGLVBS+2N9fX6Ev+uAyWQCrk1aSW0a2fkT4SzRNQswCO8nUltnmySHTGAh6nL3jaYG/a4unb+L9NYO8RD/ew0PNpm2cm90mamSEiytVy1YDfW/bGLuOsk4aTQR4PdrDURvDZLruHxX3qOjLznuUpTh5L/jMj4m45tN5SLUCA5wjiK7x3LBdjLDwpvW4wAj3vuke4nEIdFz/CFtohenJbqLIt7emfkbGhWuC8VqIGm3tcBsyR6FG1qlyJW0jaADKdKKzjva3NLLVij0qwIiy+EiEiwUqdxW2LGMQ1Ng==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json
@@ -581,7 +581,7 @@
                                    "LoadBindingDataOption": 1
                                  }
                                ],
-                                "ID": "284b5b67-fb34-431e-aca9-7875a7945840"
+                                "ID": "dcc5bd21-1646-4d98-9a81-1f3e1bc6a77b"
                              },
                              {
                                "Condition": {
@@ -656,17 +656,17 @@
                                            "BtnText": "知道了"
                                          }
                                        ],
-                                        "ID": "28dea301-ab84-464d-a3c6-86066eb121d6"
+                                        "ID": "3f7ba6ce-1fad-4921-8cf2-872445542c22"
                                      }
                                    ]
                                  }
                                ],
-                                "ID": "d9e8a1d1-bda8-432f-86a1-b261549574ce"
+                                "ID": "3421c9f6-e7ee-44ae-b031-a0ea60aae078"
                              }
                            ]
                          }
                        ],
-                        "ID": "26c27d33-7992-4f1a-aaad-c53bd9dba51d"
+                        "ID": "7afffad4-bc80-4a20-8743-9e43b1c45124"
                      }
                    ]
                  }
@@ -1005,4 +1005,4 @@
      "Formula": "项目成员!$F$7"
    }
  ]
-}//BG+fzS31OUF5grgUyM2G3OhL9EdgJD2HUR8T7tKS7DvuYgPiCA9VSQd2XS4kb2YW/c4YtDw5MvCI2Cr9m2thBxTeVvfsvcuozYoJeixhD0lEE7ozEv44a5GO39/T226DYCOxlEZGbApuYTb/rd+WypvGu7+tu65mH4nOXWN4APLUfHRmHMCY3vn+zn38bq0RdVUuIvP9g+/iyx7inb7cQZO3SJVP8XywkFodFcXIpRuAdIgZ3x6ItmzwXl+0fQzhF23ShEAst7/7TAExthVhk58rhq2ho9cKAw5aqPF2CyHg0dSCPZ/gjTIboOeza/ZoZ9Ir24XIZNXd1/R9p0hH1spIPo8e9TOy/4DUR1N3uu7mEUZCbDrvlLPV9HGmDFQLu9tD3VBCqbiCAp1EPf7GH9leDjXBGANGvVCA1Xwi7cQRv8dVMX5+pF1U37PIBfYierUBn9yVDxLlzOzmS0cNG02LUk+Niff5wzJKhTkH5VRiIhDBviw0wKPv1jLnNA3RQ3Sh/hl5S77lxBNd1u/4bXoBrObFt7FJ1Q0/T3G47XE1rVzf2xb4c8F/5QMrM0oIVxm/yPkNtY5L2qJa6p5cT6IFELdz98m5eLEY72IAyOcZSTcOMoADTpgcYTqi7TeytLHVZyn0W/os2HejcUS4tayO/7S+aIezHTiM28HOrClO64jvWlhWisztzy+M/j2HqxYixAarlg+YtQXlOEdXL2Xz58W0FPlRvBmEasV6glmedxT6if+DRwf2anFDVcNFp90U2CTr2JmQz0drZacrr6s5PJCYKPuMLOUbA89kzlEyrr/YYNHNUxkZ/wmPLIoF+UWxbmol3Jp/245xjwuStkiluefPDmQEGzSDmg6T9XXeeDy4zcQ4kP6ok1CiQQ/qUPP5v74MvrkhKC5s5rz23w==|920
+}//D7z9gvwevds1r2esPgcOgmh8OgcJhVQi8ZxM2FjS6LaqU9oNhK3M7K7j2PuutCqFIdRpKPraWiJsViQeT48c30hunqQ/FqMxjBO07YBN/AmsCZppJIXsbUyrGH0koeAYZuw9oW2gLYCcKk2ogywCeRlGqhXVaNajOIXV3IBYbujHTIQhJ7Og04gXwhg0Hi7yClqyLIi+8Y1FLPnxcZ2BXqL43AdsR34D7uL0nn99pQuhtjewNvOurej7VcoZHCf+ejnI+9hbMs4JcIFXpMDYZeiwSSju4/GV8dufOyUUACUHUau5osqxC8rHIPmh6UejvJYyEquIAFjEpIax82OdbeuzryPEjJ8qBDlPmknyFghQfzMd64KGeZwMxK6x5VHE7gL56bwwGYpRTG7CYJo1T794MVcGZgJ72j/XVrkodQaj3PXygz+eUyC8v8ivpSotpgUuc2l7udyyAe81RguuiTsuujX90F/lva9onXdMVMPNBfvtmqqbMmkHVcDBr/t3+MRJxmxyuO8VxKbx1fRxxBJUVpHYqN1sAAJJdOhcL/Ua+Znn2wQyVRbzJVv4FSXyjnE1B4mZ9gT1UEx+TC7Uu45Z2u/N6aHPwbP5+ey40NljEnL+SZrLPxxNqJgbbDdCFppRmey4PgWTAPCocn/mUgw0EB2yAyxXAVpLrAB7UK0YqlL21z0/IHAbe0LOIvEqZCJv0FrV6GAny0o+M0BM5t4aSc26CIsFxbsOsdSyfjM6FK5cn0GieLx8/Q74/QjrGQpHlE5Z6+PzG6CdSN5Jju2wtsoWsNAlVIwLYkWz13T/m6YmrQKAN2LYsBkasMI0HwNufgmG51uV40UAhDS26De6xRCMIDEf8z4EICFxKDM1kbG6O/EARYMYnmEZ2au8Gu/3vLGgQJhR9JBHiz5GaA==|920