{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"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":11,"Name":"UserService"},{"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":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"},{"State":1,"Type":1,"Name":"PCPage/项目代码"},{"State":3,"Type":15,"Name":"ServerCommand/新增任务"},{"State":3,"Type":16,"Name":"TaskScheduler/仓库新增事件"}],"Version":"v1"}

Pages/557031284d494486b3b32eb2329c19a.json

@@ -6,6 +6,11 @@
           "DesignLengthInPixel": 15.0
         }
       },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
       "2": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 6.0
@@ -21,11 +26,6 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 15.0
         }
-      },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
       }
     },
     "Count": 5,
@@ -55,15 +55,15 @@
           }
         }
       },
-      "4": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
-        }
-      },
       "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 48.0
         }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
       }
     },
     "Count": 5,
@@ -228,4 +228,4 @@
       "Size": "15,15"
     }
   ]
-}//fJt+QG2VPqsFJIRY7mlTKKOe1832dBXGEy9txVQaDuOWB5mshjeWAX0Fna34GdfFrSvRJX7AyjjWPwaI9wmZkLy9nAeGSjlC5ZCK25Mo/7lUmona1BPrVHNtKqG2xGJJlggzTIdX7LQA3Ejf3VRPbNVoYScoTlmFmSeakEVeZ+1Gs2e2UpqR4ELDGmOl7R/fItPOeCy4OPQEsk2ETfIXHXzAk+CWVJnfbv5MpGpgnrk3ke7REYzBZMo43zw/9qAQ8H6qsp6g1VdU+95LW8aWxOUd0edorQEB0YYjRYaPncaiDs6zC5Y5FprK0P7cMjXsDCV3nnjiYohJkrTkcz+nepUPDLdOlRG19LWgxM2aTTJ8YWCFFm4QvMOh0+1cSyhHnxgnVSQt0kkgLxASRP/Y6B9BZJal80r77C+v/ryKQAqfqh4/0ZyRduibbR6mqHWb1tuP9A4hmJq/GqbT9SxF7jjlJpvh3gT2cXJejgb3DTNK4CvuAAkrFYbWnXAkGNyYPvfPdErCf+vNqoZk/tHkxAeQSz+q1Wo8ySU/kh+H4O/EMMbaRYPNKPGw05xwkO7fjDu9hiSzDnuyEQQ+q+q32hAcQGPSKNxC2hV6ePTUeDoz0qkTQ6zgjJCQrGCY37UmTNqK63XEhMOq0zP3epGEyxF3XlGhEWb7sVI3ZFHDCGclf+mPxUA05wZSjs6kYjlKgsY705Uaux5q73aMLz1cpQsi/9CCrcyLHg0fku1pHme+TtAtrX6HI+v/RZ8yos0nKoiCyjOQl2K0mB2gHC8RnmxPtrI3bfVYaTBk2o6ANAleAAqRaodteNngbLyFYEHWcTNzYKcxQ11L3e/eYSuEfPw9TtJhdbXmYZEd3OW2RbFS57BtX6W5QrVBQ4Fsa9cE5dXiQiNYRtI8FyiIW7Xpog==|920
+}//+BAylswERSQoVaWtxD5b2ceBtJtt8RQt9yHMNgiugnys3dePXcLwsqDINh1MIPlbak8xnx3qwr+tIIG/uzw70QwGiYIbqrBzsOp9SeHIl1sIdyBaxDiD8qO0gNpA/pDlY5Rvr8gntSYDh+QgSFHXDychZ59luphWA+xTQWZ/8BnHsdNILXT5PzYNEfdIRCdw1JD5YPEKt4M/o8/dgA+LGVFbYzjURea2rZJlwEfEerSSI+n6GVVXjgqy+Z63noPnmAGs8RR/PY/uF3BqirtAJ/WLhHg0MrYdNhdx/kC6QPWU7tzDAuIftSF7/2OCyrHug7ykPHsUKBDE7/hKvfVylT8Eh5hmajPfR8lzSdX315PEOuxGmeKIPz+e+qqV5C9H8rlihjzqb5ZuMA+7LxowXvLGJ42Hqa7MW1uD+uT7Cl46EOi26SNhYxOpTQu+E8nfn5M/BPf3plW5LesearMUug2b1k09k0ieLbyjpIFX2qFpFgIi3uxNObX/FqzJ+F+iurJqUDjfWVIaBoeroNxbL/Ev2xFl+Og3xRgfVWTRbCkTTkOA4O0GIprIFhidsIcAtMkrUwmbKl6xDlTCqr5sj49DGuWJfhk4v0/pjk1WFC/CwOd/bFCiIFSgZVehI5k6e6gLOLxZbfmjJwCp9yY96OxJs040v/HDwMfV6H0AkrjIrnaFP/cmbc12gKux69/B/o2teH6FmUTW1By4CGHPL0fXcT5swkiM4kVvwdIgwzufakaS0k2tc4EEtMDfm/7QL1BB2K20zGKaQblupOPgI3CB2Vvcad2BavgiYSAovL9bR6Yt0XJJ0cE3zFaKRI6H+8qV3PCQix3pnWXaEYmASI9cQAqabYpcqt0C9AUj9L+90OzkIDD3lrAaWPr/pv3i20b+7yXecF9BUfNczDauWg==|920

Pages/94f8bae36aee4ae7aec2a063ca731b1.json

@@ -145,7 +145,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "a169e445-d5a8-4902-8027-247010f8d57e"
+                              "ID": "cf51b303-98e2-4fac-9e54-65d82a329b53"
                             },
                             {
                               "CommandList": [
@@ -157,12 +157,12 @@
                                   "ConfirmText": "您确定要删除吗？"
                                 }
                               ],
-                              "ID": "7a6b186e-3d6d-405d-ab0b-f1b799ef2c11"
+                              "ID": "828cc793-4b72-4c51-a1a8-61a343e0b9c5"
                             }
                           ]
                         }
                       ],
-                      "ID": "5ed65a13-9163-401e-8570-b303af45843c"
+                      "ID": "ad06eaec-e5c4-4c9c-9be3-6e91dbd3e114"
                     }
                   ]
                 }
@@ -230,4 +230,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//k30K1JeNUEDOKpUtJxuw8Us7qjBRiokKoJJlthINZtlFr4zV6dtQS5JHCGvhhmXTPZFXB8fOE/O+NgzjtdBpBKvdBqsUIricPlQO1/6/GZPcINUFjF96SpklBbSlHW1hJvdisVKBHasbuHmmraA53l3Z2w8hR9qd/ewP3sM0htK7uTHQ20yKoD4hoUWrQsyc3527YK3Zm+lQzpUeh/+JXWdijnc0QW55cNeMHr5qN28VwEbhaHsOR2bBTyArjoulb5Dp1IQNHmNtiyUQarNNkKvQ2nPo27wtyCxFZDM5SEwGRSIVDk3LBHIfYKPyFkNEBH0h9NGhkz/mTvfEC3gkbL09BfCon5IuetK9iOdbKOzkBqIWMZzPMK6t2L6j94628ZRBcnuYg/MF5J9Axm+ZZQK4RuqnBjZqgYWaKQ3XPos6zGekOSjdyWCwRffalGlkXjopEg3tKQYa9UBv5AeBUycSJO0msSy89yGhbYeexUDVf8ZBdWuWhhnE70nAtRZUccO0YaDyjwnzx7NofvEhT0MdnvtPw5CtBXhE6vBAY6OSFAN+UQzeHkO+InG2WfFpZoLmRRUD8ptXq7XZMVKsEmU7gJ6aDY7HyLt26Kb2Weq2auYmN3FbASv9y4rtIBUCVXZGEkFC/NPNnWFiSCtXO7njyLay5prp4bRZFWkLINbV/FntEkqrcURJHY4SM5hj5k3Jvutg05obc4AocApJ/JZreToW1emvx4VlNJhQCSOVscNg1ZI0RrZLL8Pi0fXBR+IqEtt8Q4Vpnt4JQ3VxWWCR+6bNZvf/xilvoB8MV9XtmBK5scgFmdvyDC8vl3M7Pp0t1BTSEtj5+g2HbafSEMEO4USSuJHGjHUqn/Hb3DtjcusCDh3bPPTk2quXohPCDqX8ZNlFNl5YtD3Giv4Ssw==|920
+}//X0m+9rpNvArdcumgB5+mShKnHL97omIkgzeqZPz6fWfUnSVdz76n6LtPjjBSuK54FdnSDBDjmcOvLQIpRlelN2NoC2VcLUmJ1eHQYs+7ZTIgB8qp+Jv4Kjm5G01wsIxa333/ijdFPn0BawFfsmGCiHDCF2TYyIpHGQ3V4rcRcLVaYRan/oljtkN9MY+mX0u98NMulJqWXNLM/nuxYoGJuhBbYD45ol7dgWyeZXle9tjcMutA+N5b19gZk8hRHqKGu2UBn8ayVE90YKkEwzTYJvh0/aLKq71C/rNkqcobRPz3k5saEEsuI38NAcDyQefmFSwT207VsHlVq8njZ8UbrmQSkRR5Nw7KIp3YDwajMPhRpT7FQkumhFUH0m583NNQxkvVXmVG+EAIJxfrUHl0aQh1HQpHjnRUNfRUvfCa+Y6QTnfUkonaP+oI8c0y0K3iO5Y1keYoKR6GLCeIX+PqNxUVsMJBPFaNZnCD4wzbiluCfFpR/Nxzrc9IJvaiQ23K/e1yQ0izpJZ+IjqfPz4BPp/8gWwKtSmz0yqoUd3hRA9r1EVsb6hYgtKzLLRuPOrCTic70z5Bi8Tb7YBudvEQfSLlm/svfdI/PrEJRxfkbTnYueP9yN1c/9CcRFUU3q0z0QxJ80ySpyL6Yfkip1ybwqEKhbkalxAu1talmvxJUrT5XvM4f57Ssw+emynvgu21gfD+/C0hEULsMcZAWTAlhNflZsxZacAFRP8XEslxkVpVLIig75PDqalsXLrrCEYEXgyTfZ4JP/zTaVuPVblHRzaK76N2kGkFxlY+AhKQaPsg7GvDY2cAo02Drnpbke3cnLzMugmHXbyhJKdiwq4cbv/DJoMbdxQGK1tCt4BzAtnu2nuAJKmWS2x3l8Y6djCnlX23Rm+rO6KF+a8/AKMZvw==|920

Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json

@@ -18,8 +18,7 @@
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 21.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 21.0
         }
       }
     },
@@ -69,7 +68,7 @@
   },
   "Values": {
     "1,1": "😊",
-    "1,2": "分组名称"
+    "1,2": "所有分组"
   },
   "AttachInfos": {
     "1,1": {
@@ -155,7 +154,7 @@
                           ]
                         }
                       ],
-                      "ID": "546eb059-bba5-4c48-8f11-b321521beeee"
+                      "ID": "5aabeacc-99aa-46e0-bc46-d8403e879e09"
                     }
                   ]
                 }
@@ -229,7 +228,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "20ee9916-c4c1-4bc2-9af7-8efbe68e602d"
+                              "ID": "25d61e60-e4d5-4ecd-9059-0de8b4761d65"
                             },
                             {
                               "Condition": {
@@ -259,7 +258,7 @@
                                   "Message": "复制成功"
                                 }
                               ],
-                              "ID": "d3fbf457-8b52-486b-aca6-df17750a1d32"
+                              "ID": "e2a1d1b4-2404-4e84-8122-3fefa7e43349"
                             },
                             {
                               "Condition": {
@@ -336,7 +335,7 @@
                                           "Message": "操作成功"
                                         }
                                       ],
-                                      "ID": "9c95643e-ec81-4492-8c2f-b354dd7577d4"
+                                      "ID": "2e0de9ad-c2b8-4ea3-92ac-39adf7788a2d"
                                     },
                                     {
                                       "CommandList": [
@@ -351,17 +350,17 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "c22cae4b-b0f9-4da5-9ee4-d054a2c5cd10"
+                                      "ID": "7de33e7b-a95c-4a5f-a30e-d8c3a4313c49"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "64ec9595-470a-409d-8837-95df485a3028"
+                              "ID": "3f652702-db27-4ec9-9d05-3a27d47b4e6e"
                             }
                           ]
                         }
                       ],
-                      "ID": "131261e9-9610-4ba7-8d32-12a6c779d345"
+                      "ID": "414212fe-00c3-458c-b53d-c0ae1fbcb199"
                     }
                   ]
                 }
@@ -377,7 +376,10 @@
         "Size": 20,
         "ImagePath": "更多.svg",
         "UseCellForeColor": true
-      }
+      },
+      "RulesGuidList": [
+        "9cfc4dcd-c717-4754-9bfc-b0ecc1ab4511"
+      ]
     },
     "3,2": {
       "TemplateCellSource": "ID"
@@ -417,7 +419,24 @@
   },
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
-    "ParentPageName": "任务列表"
+    "ParentPageName": "任务列表",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=a3c94948c8a24e6a9d63fc05ebfd71f!$C$4=\"\""
+          },
+          "GUID": "9cfc4dcd-c717-4754-9bfc-b0ecc1ab4511",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsInvisible": true
+        }
+      ]
+    }
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -436,4 +455,4 @@
       "Size": "24,24"
     }
   ]
-}//vnoUvkRLeYD/w8aFCBCW9rr7D0gHQ5wVOL1ipBkdfFE8YZmVFaV7sdFQLqoGoa3BrNe6RbAxusBzH1wohYbAePM+oXWZlYkrD7LzRKRUSkn5BVNGT/74SV9xAIBM1X4XA3zoQgC5zvSi5ybXyTSU8IZuPaGIVYFmIki4bne651xdBYFqhFJFWI+4pPnr9u64DFClYLfQSamtt/FiuJZMqe4Wqu/6+UArbFJQ9FABc6Gd2zHIZBnygJAU+9wfkYo/ooGtm2/mX/+rYRDX9DHa1iCMLrYX0qY+hoFr08v5EBwtrv1ovKCLpp+lPrUwvNLDUGMknKxppiWV/xQG24t/eJViLH8BOpWbMZM4M6MKrXE2FaMHBl+0HR4s19fh1jPqhutXqA26OH3jWyR/vhwxIOu42XjKo9DKOU/cILYndW28GuN0K/p4LFbmT15NOQV6zT2IQw0CMQZL2SgL6rTQaKh1RSC0NoNj5RisMnnH5qVzNPcnWr0+fhVBtayhSofIQiWhWODXdHlKN9WIHMdUfI4XnHk7mCIh4xmLyk0UfNnTe8Y3Kz/RThSkSXgSMalZG27707TU0+NQP3rLfNsEkqHRG1I+MLFRVcZQq+J7iY2aropDCyPpjUO+6bMDmCUXIkhnsEPFf4OG8C1/5YEUndFiHog0sORwtP/s28GCUhnbZDYO7quNk33Ih4mnkvriYCCV8/NtiBgmn9EfEsb9SUL9ODKSoYg/LOsD9D111E8peS09wBt3D8/jzPL5RJhxII/HvT1STtUFR1cqBn/0Rg18Wb1PFHr3jSrlxvrbQC1umhwX4TcpNfJ39IkIFQwYgB8BoDsy8NShcbbK/sycVHJxOPd6xxZcJeqcLtdUkyNT1S2GSOn2TGKj2TFCpluLbHXPuM7SbGW3AHnDJMYjoQ==|920
+}//P0mjxv/7G/mavUECp3s3Z5oyqJ1Uo2T8myvd9/wdp2JS8YuMikzRvrzOKcYj/U6IwRYkcPhebJy04qj4q18l+UtkKr2pWtL80vWapDpoWss+OeLIxZAbh7VGfSWAOrZGOvBN73ytq5+dDcDxzMvzxLT/d8gf7C1qnn4IHf1bFT2GQXA4MvP9MFWRw0JP2m8DnDYik2eGyyYPSpjkJAbwmO9CXEF4zehV6jLbrm1+P+6iuMnxAtFEfN3xPSr+DhG7MuNTPMrosKLhAWX5wVIhX5M+F2MgaSbeCIIjSwEHSnnwAeM9y3109aeQgGvMzp8GIo/6024qiKq8zua0YT26UgA+BGGRAc6CDNLB/dcdvCj/RISlaoBsyZZRkJPNENY/w+tQhah0hRw4rG8TFwGW329KBVv4z1eQqIZffqhJP8g2jeEA/UptRN48g+kM3TXihyD81b7AdsN152tpb4OScLiL3M8YQhkJ9a7CAUbZbk6CLkEtRvUzVSiyf35H+zXifOQa8xI2RSPLKKTtrtBzleNRlzVDocDiuPKa/h8NKpxCxx60H1rp4daKORJsbuxXYhvGTqcNj53x+Wmt2f5jKRSXWXF4Z/m4S/REJOPXEAoAtj5AnQ5953N5x94TcgunI0OY8NTqzvcQzl760h11XGznxwSJ5Num6zbEfrCwBYM4MB0UOP6T2wJZnTPjqoBSi3iervWBri83inT4j61O/lSkNBdcFBddqMAduyWko7rq/6ED6EPedhulaQCt2us/NUIPZV/09MrwBUgmWvG3nKj4DIqJvbuGZfmCoSEFPp/ekMdwwUZSjaICkv6PVTsGiLnkuBOj+WRZMQcMvIQO2vXVeQvQvfJYvVa/Vq0mhK+D/KEGuhXTiXIfQn5pB8d7RR5tSbNFSVrlZwJCY3/L+w==|920

Pages/cb2a6325e1334f5fbcb7270deba57ec.json

@@ -33,16 +33,33 @@
       },
       "6": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
+          "DesignLengthInPixel": 20.0,
+          "Mode": 1
         }
       },
       "7": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 16.0
+          "DesignLengthInPixel": 28.0,
+          "IsHidden": true
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
         }
       }
     },
-    "Count": 8,
+    "InLogicalVisibleIndexes": [
+      7,
+      9
+    ],
+    "Count": 10,
     "DefaultSize": 16.0
   },
   "Cols": {
@@ -99,8 +116,7 @@
       },
       "10": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 53.0,
-          "Mode": 1
+          "DesignLengthInPixel": 74.0
         }
       },
       "11": {
@@ -116,7 +132,8 @@
     "1,1": "版本号",
     "1,10": "创建人",
     "3,2": "空间名称/仓库名称",
-    "3,9": "master"
+    "3,9": "master",
+    "7,5": "立即绑定"
   },
   "AttachInfos": {
     "1,1": {
@@ -125,12 +142,19 @@
     "1,9": {
       "CellType": {
         "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "TemplateKey": "圆形"
+        "TemplateKey": "圆形",
+        "ImagePath": "默认头像 .png"
       },
-      "TemplateCellSource": "创建人头像"
+      "TemplateCellSource": "创建人头像",
+      "RulesGuidList": [
+        "1db67ca9-ca8f-4621-8730-b7daa0920e07"
+      ]
     },
     "1,10": {
-      "TemplateCellSource": "创建人"
+      "TemplateCellSource": "创建人",
+      "RulesGuidList": [
+        "1db67ca9-ca8f-4621-8730-b7daa0920e07"
+      ]
     },
     "3,1": {
       "CellType": {
@@ -140,7 +164,7 @@
       }
     },
     "3,2": {
-      "TemplateCellSource": "空间和仓库名"
+      "TemplateCellSource": "副标题"
     },
     "3,9": {
       "TemplateCellSource": "分支名称"
@@ -187,6 +211,65 @@
         "ReadOnly": true
       },
       "TemplateCellSource": "仓库成员"
+    },
+    "7,5": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "任务版本详情",
+            "LoadBindingDataOption": 1
+          }
+        ],
+        "Text": "立即绑定",
+        "TemplateKey": "_RS_Success3",
+        "Icon": {
+          "Name": "git-branch.svg",
+          "Color": "Accent 1",
+          "UseCellTypeForeColor": true
+        },
+        "IconSize": 12.0
+      }
+    },
+    "9,2": {
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ],
+        "TemplateKey": "_RS_NewLittleRoundCorner",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "Location": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!3:4,cb2a6325e1334f5fbcb7270deba57ec!7:7"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=NOT(cb2a6325e1334f5fbcb7270deba57ec!C10=\"\")"
+                }
+              },
+              {
+                "Location": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!8:8"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!C10=\"\""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "TemplateCellSource": "仓库ID"
     }
   },
   "StyleDatas": {
@@ -233,6 +316,14 @@
         "FontSize": 12.0,
         "Foreground": 2,
         "HorizontalAlignment": 5
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 12.0,
+        "HorizontalAlignment": 9
+      },
+      {
+        "Formatter": 10
       }
     ],
     "Types": {
@@ -245,7 +336,9 @@
         "Left",
         "Accent 1 0",
         "Right",
-        "Background 1 -5"
+        "Background 1 -5",
+        "Center",
+        "@"
       ],
       "Borders": [
         {
@@ -259,12 +352,6 @@
       "1,10": 2,
       "2,2": 3,
       "3,2": 4,
-      "3,3": 1,
-      "3,4": 1,
-      "3,5": 1,
-      "3,6": 1,
-      "3,7": 1,
-      "3,8": 1,
       "3,9": 5,
       "3,10": 1,
       "4,1": 6,
@@ -277,7 +364,27 @@
       "4,8": 6,
       "4,9": 6,
       "4,10": 6,
-      "6,1": 7
+      "6,1": 7,
+      "7,1": 7,
+      "7,2": 7,
+      "7,3": 7,
+      "7,5": 8,
+      "7,6": 1,
+      "7,7": 1,
+      "7,8": 1,
+      "7,9": 7,
+      "7,10": 7,
+      "8,1": 7,
+      "8,2": 7,
+      "8,3": 7,
+      "8,4": 8,
+      "8,5": 8,
+      "8,6": 8,
+      "8,7": 8,
+      "8,8": 7,
+      "8,9": 7,
+      "8,10": 7,
+      "9,2": 9
     },
     "SheetStyle": {
       "FontFamily": 0
@@ -287,14 +394,35 @@
     "1,1,1,7",
     "3,9,1,2",
     "6,1,1,10",
-    "3,2,1,7"
+    "3,2,1,7",
+    "7,5,1,4",
+    "9,2,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
-    "ParentPageName": "项目代码"
+    "ParentPageName": "项目代码",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=cb2a6325e1334f5fbcb7270deba57ec!$K$2=\"\""
+          },
+          "GUID": "1db67ca9-ca8f-4621-8730-b7daa0920e07",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": true,
+          "IsReadOnly": false
+        }
+      ]
+    }
   },
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
   }
-}//LOcWpgYk3O1n7RtX2WZRulOh5NUX7IVzGqJTTlajFmqikRioc2CxMLbW/Z9fKW7I1qz+o+yt1gIiuQCxukkL8oVkOBj6HoM6RYm7lLCRD6GPhG5Z1wsbZiSMjh5CCYGkNUxGlRDjYHcaeNTm5ARVt69KRNqEpEAGkk77WI/GpWzKiNmOfiVzE5nZsMB5YuFpLyAzvMle1eSlVSgsjiuPm0u6YQRS5wJokYlD0ryZRKxRyMULLTnuqvmkhJR4aD1zjmOpZETm/tshhL/I8Wxvx91XtCA8BbYnKiPybCg/Yaz3pcBhTBr17ASpaY1J0S8p72e6kolIVECwD5nZdbfy0sQrXkXnBbUwN0HiWEoLI8tySS1SQugJxpw4oX9RiQQAQB3BIzUNIEBtEhIFQCTJk26QCgZVNk+Z6SFayFNDn+6CkfzZ/G/0ietmhDb1xuB7GhTH+UvJqEydCZw6L1ia4RILMVaEfxV7Xhdp7hBYYodlYIdPBqHbXVgvVhRA9fWJQTBqVuNXJu8We4fxO7PSr8w4u/RoVCB1NrcMYepHGhkF8EA/tQdaugRP+gKjSLtwCR1nE4DwX4SQ9JaPuOBLnuX2L3l8/hKJFa1wUpVjgYCl3YsCqDbI8R6E7kUhhLt7oMCm7C4tOrGBzjQWfcuivxJTSFGQgVIMv1paQOrwZnExLeXGNq9R3GDac56PUQpq4roWoSLP6kWoiSW5SECCFaOaVoUpY1mOseKf/4ui+bS1Uv/3wE0CorcYNCdtcRFYvQrJriheioY9h1UvrNRKwQJMgd0Z5eUB7cfQF5Sb+lquarCcxzuKfqt5V+SjhlgPZnXj5FqW/uof46MWzqTwifnlGMPRxaVg328/0YXOER7ru+WdRTtZQTgKbfCbm+AFh5AyBrBxYoyJ/d2H3KbnHg==|920
+}//7XbPWQf0nIw9bVQ0cRCmXbuLtYj2ffSwXiaqL6r1nXEjd020N5YtCiV+pwhBPivB160Og3V2Wozhi64yF60DI6EsBR5tMdMM5LC9NRsK5/+L67y2KR6ztHINKHHa4Ih064zbajAH5YbtNjnsLatSfS/xwGPgJjDJoGFb5VqSYno6QyvxgrSyAenRLFBATqMsYW28Q1wxcHeHPBDH+4PKyDrIS154oQay0SVH6Ekz9IzDzxMF34P8QTN4X5KZ/m+tTN2hVwQ88lRzHuuWIb9WB0M6Olgy5cllJT6G9TlJK4HzTlP/LV2N8aRtgkVhk8o8xrEddGgvvKJZffswtBajiTu8SW17sPhFoaW4Gkg7ct2VW9A7qs9V/kCfvacRmXze1ubF0mDRjFLIzcKWQE/AZAhLQdzMqpKS57XhyYFEoLScvJrNkD1qo4cTuur4Kar+Iwd1IVMT6xMbhKcCor4WV4yCE2dbvRltZlDwekwROOMd9lacgtoAqu7wLawLt7kSYXk7DIWjn0lgaQ0vYXbQXhoidpgEHJfIVFkeSfw7qQSK/8lsG1YvnuU/r2PajP7x8rJJd8zWYkbT0XlxgDB5/1C/lV6YWZwpvtESq8MhPMLAIGYEToBcz0o1Jhp9P3psVys1sHdKJ6YV3oh9ZluZlD3Tf8qmAMrr7GCaspq+Wn+3fff9YNIw/w4glm2K4s3pq1AG1rMzVnpGqe0kWWUkiQMT0UqF5lQcWP0UhAfPJ09JlKgY3xuTF5m7dZWjHlA7x3NOWZPwvReNZliAbNM4eIIMbblfTmmU2HMFs51amzfMU+H+IZbib7J7JfwMUOtruhuY4DpB6unwyfrsbMuzMgKec31FpdqTrds5UcZ8iORIyUOruR7Tadaa6j53Nq1LsaCIAUXLu6OQPKHEUFlz9w==|920

Pages/cb2a6325e1334f5fbcb7270deba57ec.rd

@@ -1,5 +1,5 @@
 {
   "PageType": 2,
   "ColumnCount": 12,
-  "RowCount": 8
+  "RowCount": 10
 }

Pages/任务/任务-基本信息.json

@@ -227,7 +227,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "01c7ea01-723b-4884-8106-8944fe16dd00"
+                "ID": "51a7b6dd-68d0-425c-8d78-9afb85c8e8d4"
               }
             ]
           }
@@ -355,7 +355,7 @@
                                           }
                                         }
                                       ],
-                                      "ID": "96a7c725-2eec-40dc-b50e-24e2d0bac281"
+                                      "ID": "b8b5cd56-edf8-49fd-b78d-1f221daeb176"
                                     },
                                     {
                                       "CommandList": [
@@ -370,12 +370,12 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "10a55ff4-a568-47c7-9211-aa27b4116197"
+                                      "ID": "8c0b29ab-9f46-4d34-8ee2-5fe4cd2ae0a8"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "1e53f846-0adc-4b61-ba78-02eb4d65a6c5"
+                              "ID": "b491b316-7608-4cea-9105-845a73281194"
                             }
                           ]
                         }
@@ -388,7 +388,7 @@
                   }
                 ],
                 "Comments": "小于进行中",
-                "ID": "e79787f4-180d-4d8c-80a9-18eb1e91ea40"
+                "ID": "2829596d-d562-4cde-9e55-098d163c6dee"
               },
               {
                 "CommandList": [
@@ -398,7 +398,7 @@
                     "Message": "任务尚未审批完成，不可修改状态"
                   }
                 ],
-                "ID": "22b31bd9-37b4-446a-b032-eaf69d4817b8"
+                "ID": "9423736f-5504-4ec8-8c41-4a3269db64b7"
               }
             ]
           }
@@ -476,7 +476,7 @@
                     ]
                   }
                 ],
-                "ID": "13e15609-1a35-4a39-b7c9-de9623dee8c7"
+                "ID": "d3422ff0-5cea-44ac-b21c-30c0a5b60fc4"
               }
             ]
           }
@@ -617,7 +617,7 @@
                     ]
                   }
                 ],
-                "ID": "0af7adb0-1077-4b53-ac16-faa4f7e4e270"
+                "ID": "7d5fab47-6f96-4d69-9261-321acf6e4d12"
               }
             ]
           }
@@ -725,7 +725,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "95c2466e-3d6d-4121-b9c8-30d50d2bbecc"
+                "ID": "68b2b2d2-6672-4f38-abcb-3750b106ce00"
               }
             ]
           }
@@ -762,7 +762,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "7d84fbea-6534-4cdc-ae6b-0a3c70496b5d"
+                "ID": "6c7ce6cb-a701-416d-969d-e16fed947611"
               }
             ]
           }
@@ -897,7 +897,7 @@
                     ]
                   }
                 ],
-                "ID": "10834e1b-dde0-4c30-a344-74d72b42b4c6"
+                "ID": "d5066fa8-d506-4b00-8861-9cf91d5c9e92"
               }
             ]
           }
@@ -1066,7 +1066,7 @@
                     ]
                   }
                 ],
-                "ID": "ed6379cc-a4fd-42d9-8d28-bdd831642e44"
+                "ID": "93d9ed27-3fcc-4866-92f2-f63857247cbc"
               }
             ]
           }
@@ -1214,7 +1214,7 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "c277491c-62f2-468e-9bab-489cbd181b90"
+                                "ID": "c2139fa3-327c-4b89-83b6-81f1159a6247"
                               }
                             ]
                           },
@@ -1228,7 +1228,7 @@
                             "Title": "计算中"
                           }
                         ],
-                        "ID": "99e73a43-9bbe-4d9e-9b4d-2282ed361491"
+                        "ID": "ad514b07-8350-4f76-872e-a28fdbe4870c"
                       },
                       {
                         "CommandList": [
@@ -1238,12 +1238,12 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "72d8c83f-7a58-4691-9f10-af03b88669df"
+                        "ID": "29864c08-3e7f-489a-868e-3da238416d6c"
                       }
                     ]
                   }
                 ],
-                "ID": "7b1217ff-f417-4cf4-b8be-6dcafe5065a0"
+                "ID": "edb8a9cb-a399-4b59-b330-a90c971787d2"
               }
             ]
           }
@@ -1621,4 +1621,4 @@
       "Formula": "'任务-基本信息'!$B$2"
     }
   ]
-}//xYvD0RcYj5D20EUb43UfWjoNYEhrQYRqhq8Ceg0qwi2ae3WIY1vjFmvv2oEd5cyqS2yWqNC5kRGoU7hiUmoJ0lNIHafvONH1w3ZUMkhtaLGCEW0fOwnfRbInD2qJhoDkSQccaWGu08+nYBVwMnh4qSmqya04EnFqQgOuFRTMtGDdYrbSH4H3IdCdu5oVeeshMtekGUdaG9u1rV9Au+LBngI2cW01NNLIC/miScKieMMjB7WaW8Gy1BP11QJ5QboJHQzCvgKfjTRaWYQGoWO8yOhJg9/Ba/Zk3PHpeYfIDgpdkYWUMCIBaiLrzq6BbqlEPmglL022jGAt4h9iTBr1A4ikBuiUs7p2b2hW7SlGp7bsA3QgnkSBl6T4AhBDYb6WfFf9qun6Fy4VU5qsFSfzwS/5yMtMkm+dzuVPi2hsTkYgI2C59GosOBDp5+LlYy3LbSK1dLliQOFKv3NBOhF0gbyuww+rto+1jynAME0oHmZjdjPSnxhGnp/6+HYYrRq2FxRf6qG7c4jUZhfXsouGv3sLBQBj5wB7URsHLRh7vgk1FE7y9JS4mqMmAETR4dGxc+pZN72rveYB0eMpyNReQc1MUxFQTvoH8X2WH8+hKj1o+2U+FSPqRceJKPQAXIyXV33R53s3uMHf+5mldTb1n7iK8oSqMHhBRm0nmxFyX9iP9JFac5Ikp0jMUyRsgQmnkmbOMnJbYprmynrzmb7E77IIItG/Mnbgkw9n6UXIQX78uhe6WlyGh5fCFcgF2T/sxmSahfgURv6LTZSwSbl5fIEqxcvxYQZlUUR0ngq1gN4djHtE5/CtH5woxN1T65akyoQDuHhl0/pKJT33Gp3voyK3eRLDNmrpxgtSQoZiagjM3oqCP4UkIBj+T8SF8VyoYW5TVBz/s7NZkJcz4MAjsg==|920
+}//2xfWeJmwd1ewjAIeRiY9jgyUjMSEWVu2lftBwWTrw1ucdt7myCBeI7GYH+B8vHpXzTIl5duqWBn4n1+Bwkt5Hh3EliS0AH3iGbLVSHYwlO/N3YIqHah8Xisu3q1THjvZLEm1XiIR4+RQseDSH3w120jR2oQQD6tTPwiLsOYRxMQTp5H6nlFKNtf0hLQKjLw4KF26sVbDKa5l2YCj7Sc3CrFvhvj4R7MoKcr+FE48J6VjuHvo6MQumJp/bAopPRA+dy+G7BMBUO6NE5LYfBk/VlgGdWkjPVPQYCMCdg1/BAKtrF6OEw1qLVrviyosXv0dsDryu1SYJfP6/ALlalYzNUUE6UsqR2eEdwixYgV16BRfyR5Eg5kdkT92aVU4T//VLDIUt0HNUAZoel2EVrTcTznt7vfPJIXYFOp2dfhmZMNM8Pm9rk/5wHL5+je8ZEfSKpbBQfV+OD/xZOy3KAr6481cD55tCyTQou6TW6UT37C9EKn975gu0mYb0KpHZ6Hy9dmCBwYjF0GSas9yYoPWNA28/b73ViEL22eL+1wEDlkqImAbTyrxv8RXuGRBO5fRsyvJdTjkntE1lA1PU3PIj7HiIsoPbVtAxBoN3ahvoRpJ1wBdUnVK6FvBZBoiS2LXU9zZuQ6ykNXj5wBI3m2oDYpKJbhWXqBmnNZpI+iUWkSQ2u2Xu9aGsS6AU/SDVDomlLhjjJRfM3WMFavqLICXPG5WpyRKAOvydcmMjNDoX+eL8svpLzuP9w/BU3liTwnZmUhoCrKngEF7Bn0FYHy0Gqga2/TCzvGFkjHjLrEZlxHlORcGvGQ8/ExrOOrVSlk8UjuC1M+hbUZCsjJoxqkMp4tNDXlAdk91SkfxwiwlGAo6e18dumrAXrHn9gc1wMetwJYlTwhsdLXDmMKvK19qVw==|920

Pages/任务/任务-子任务列表.json

@@ -153,62 +153,96 @@
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
           {
-            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PageName": "新增任务",
-            "PassValues": [
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
               {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!项目ID"
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                    "tableData": {
+                      "TableName": "任务表",
+                      "ColumnName": "任务状态",
+                      "GUID": "d1f5930b-e3e2-439f-97c8-9e507d0b2042"
+                    }
+                  },
+                  "value": "2"
                 },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!项目ID"
-                }
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                    "PopupDisplayMode": 3,
+                    "DrawerDirection": 3,
+                    "ShowDrawerHeader": true,
+                    "PageName": "新增任务",
+                    "PassValues": [
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!项目ID"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!项目ID"
+                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!任务ID"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!父任务ID"
+                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!C6"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!任务类型"
+                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!F6"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!任务分组"
+                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!I6"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!任务版本"
+                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "='任务-子任务列表'!L6"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=新增任务!任务负责人"
+                        }
+                      }
+                    ]
+                  }
+                ],
+                "ID": "27506fa9-b535-4ce2-9eac-76d6e89d98e5"
               },
               {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!任务ID"
-                },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!父任务ID"
-                }
-              },
-              {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!C6"
-                },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!任务类型"
-                }
-              },
-              {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!F6"
-                },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!任务分组"
-                }
-              },
-              {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!I6"
-                },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!任务版本"
-                }
-              },
-              {
-                "Source": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!L6"
-                },
-                "TargetCell": {
-                  "SerializeProperty": "=新增任务!任务负责人"
-                }
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "Message": "当前任务状态不允许新增子任务"
+                  }
+                ],
+                "ID": "7168082e-8d57-470b-84d3-ad0374e8b467"
               }
             ]
           }
@@ -338,23 +372,18 @@
               "ColumnName": "任务状态"
             }
           ],
-          "SqlCondition": {
-            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-            "ColumnBindingInfo": {
-              "TableName": "子任务视图",
-              "ColumnName": "父任务ID",
-              "GUID": "39e8e6ab-9c57-4528-b057-92d7f07a764d"
-            },
-            "Value": {
-              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "='任务-子任务列表'!任务ID"
-            }
-          },
           "IsListviewDataSource": true,
           "CustomColumns": []
         },
         "DataSourceListviewName": "图文列表表格1",
         "TemplateKey": "竖排无样式",
+        "DetailTableSetting": {
+          "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon",
+          "ColumnOfDetailTable": "父任务ID",
+          "MasterTable": "任务表",
+          "ColumnOfMasterTable": "ID",
+          "DataCommitType": 2
+        },
         "CommitDataWithCommand": true
       }
     },
@@ -524,7 +553,6 @@
       "5,8": 4,
       "5,11": 4,
       "5,14": 4,
-      "5,15": 4,
       "5,16": 4,
       "5,17": 4,
       "5,20": 4
@@ -544,7 +572,8 @@
     "5,5,1,3",
     "5,8,1,3",
     "5,11,1,3",
-    "1,17,1,3"
+    "1,17,1,3",
+    "5,14,1,2"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -619,4 +648,4 @@
       "Formula": "'任务-子任务列表'!$R$6"
     }
   ]
-}//CwuLhplzw3I6ZQmoFfOKTC/tVcrZKLjHDUD9VRExbj8+7Izzf310iqnLherPN1njRXJbEdVaTANSGEGCSDJOlqQpvSs8whY63a6iXLtXUcrQ2vwjDF+MaeszG1o9ufOSoqymoMq0yfPEb0pV6qP+EKzLmi/PN91MqLbGz6PiOlpdbT3jxLwWZ8RnmKZbtpE3+51bhYMO6D25XyXRF9bAOO1VU6PVokzb4lzFalj1vMU/igJv3NO/srWIsz8blIK1x8AMiCop+V0zB5euXi0LkVAaRm2vBu0esz2dSKYwv6bnq45oFEf/mfrjaLRCptbsO6UQPUy5puKkqsXudQ7Tg7xrvcd2TUWF6S57gI2rucDVi9SvTsUYK92w3tfxN8/P4p1TgpmyksZju7VEDW8AJqYSA5p2GOV+7iZ6IE7L19MKseP0a/En+J1q32ln6YlNMeb00jpaLacQhmHg9QOrf2De/umkUKqRDIHI5lsNmGcHNc0rc084cwDZqbMWmkp+311+Igh29kusTwVsiLDqUN9DDBt0p6jrqqTsxQ53820rWXFKDOCLKsKQs7lvVtAZmUp217kdZT+h8XQYhWA60BwICcVTu8n3YJ17Ki38MaZh6GzT33Bt5aH6Dm3fxJDE9p9AElpzcMVBBguaMrKvUDcO5PPTo+c+rCSAnW8jSpoAy6xCjBnUeamsob6jIloCSSIzAA46jcp1+mJuRGKgG4xSVbZS+6FVtkrhsxqkMxSIIhGD6LqaGUsA2gnvq/kqoj9WFq+JZ/VkRvRAjufrOpTJw3dyMSeWNVWW4bYKo7IuvgYeyZwlnTq2RqJa8mrFyo8Cw0nZ4ssSRJE8k1FOAmS0hZKF0okxKitolw1JHauFR5669AwCp4kc+jbArA8K6IIM+Ms9oLvQcGprY5i97g==|920
+}//ugIm1VK2S1pPZmrliuje/w9teqq8VtVHohY8j4ZzXDYMI6hL8tHonMzS/niqJcw2H2KHJzo589rARmYs5/1l7+iHPuGZyBlZNw9BQqcF/3rzmEiKMnbIqDGIBr8+zH3E1qr0cBg3mh9TO+hWOInAybDU3X1O4eIsJCNKeXDV3KxTw7TgdtH+P1wTT/QbRJCFhFuNaelLpVHa/Fqr5nV3K7RTCoN9Kgd4RY6i/b7GWSM/Rhb9r46OSrKzMxViucmZkzHsK1usyV2DP3RyRkajKO+znUWFj0tBQKxdaW+8Yb69ax//x5KwRPVHK6ZuzPoLgT56XQmzNLzB3P1ipA4UuSaaTsI7v7/9p06GMVUn65Q5DBqd/jgvmDaz/JPFjZXllhVO50s45v1oSWqFliTlDSh23g8i6BewomCZyuJkZgORW/AOJzjGy1pFTP47iW0aDwVcm8bV3ibaYjUJow0eAS5KcfOQNiYcSDF7iHEFC7XqT0Z7T1i64hCnjSkG/30msre1wGPR4z5W3OX061no/YyT1KMqOpGxbACDrVwsoCNYkXNztVBZ4PC4ePdnPdy/z/Ne4P8LhTJO5mr+gQRlhSx988LOvuRT6OZ9WlLqB2Aun1LAjeKjWbiZ2/7AyGX6LIDmPSA1XMAKO1uMPxGAXt4c1oKbermTTtAFL6fvry76p5gqCD6mBoRLPO7N2wXFSlNs5RCNwH/unQIxAoeWvevwQ1Rjh7xB9wx2N1jtiwvNGUGs75MByPbHlnp0Wv2d7Ka/oBnoW/O9syeW6+HJNc3V8WGr8t4zCLuXU4iwuFV9kHqiuR0kVnMyq9+z5JOTAGy3N+8UIOMaVNHgFLoM0Opn3+lAnrvDzwH5qZ2tvdjW7e6eGUhkS1tB9R60Vos1NNl74ZwRNSEtiY9arrxsuA==|920

Pages/任务/任务-工时.json

@@ -315,7 +315,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "c97e4e8b-5dec-4288-9761-b6f4c74b429b"
+                "ID": "9cf170a8-4ac9-4331-a0f6-9cb4e1c11672"
               },
               {
                 "CommandList": [
@@ -354,12 +354,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "77ee42fc-45dd-4150-88de-889c09466046"
+                        "ID": "460463fa-d8bd-4075-bfbb-2ca3994e853e"
                       }
                     ]
                   }
                 ],
-                "ID": "7085d01f-329d-4505-99fe-db4b40cfa027"
+                "ID": "b6d4150f-53aa-47bb-9ae5-150470a65e8e"
               }
             ]
           }
@@ -396,7 +396,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "80058c79-33c6-4b3b-9f50-b6512a7167b4"
+                "ID": "9814dfee-98ad-4f80-9948-738c04fdc77c"
               },
               {
                 "CommandList": [
@@ -435,12 +435,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "9529864c-0468-4d7b-abb4-fe72905a593c"
+                        "ID": "bed5342e-7142-40bf-89b0-f624d41c0293"
                       }
                     ]
                   }
                 ],
-                "ID": "66cca529-3499-4b16-80ce-a3c806efeaf3"
+                "ID": "cadd656b-bd10-4070-a652-9f0a2c27adf7"
               }
             ]
           }
@@ -493,7 +493,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "6e2c5b12-5400-4887-a213-6ffa2def1a1c"
+                "ID": "00c59ee6-34fa-441d-89bc-1a86c36d4aae"
               },
               {
                 "CommandList": [
@@ -532,12 +532,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "da200d3f-f244-4c5f-bf85-fabb6c94b7c9"
+                        "ID": "6d1329ae-9bd6-4ecd-acf1-b42ce3877843"
                       }
                     ]
                   }
                 ],
-                "ID": "dbe134ec-cadf-4caf-af6b-a71ff9b3e6ec"
+                "ID": "d3f07e60-fe73-412d-ba71-412839af0420"
               }
             ]
           }
@@ -560,44 +560,13 @@
                     "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
                     "tableData": {
                       "TableName": "任务平行视图",
-                      "ColumnName": "成员数量",
-                      "GUID": "6d56483e-74b7-4690-9382-70a314118cca"
+                      "ColumnName": "任务状态",
+                      "GUID": "717883c1-de70-40db-a09d-83b7f942cc38"
                     }
                   },
-                  "value": "0",
-                  "compareType": 2
+                  "value": "2"
                 },
                 "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                    "PageName": "新增报工",
-                    "PassValues": [
-                      {
-                        "Source": "实际",
-                        "TargetCell": {
-                          "SerializeProperty": "=新增报工!工时类型"
-                        }
-                      }
-                    ],
-                    "LoadBindingDataOption": 1
-                  }
-                ],
-                "ID": "0a650300-9647-4bfc-99ea-53fb92e25d08"
-              },
-              {
-                "CommandList": [
-                  {
-                    "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
-                    "Title": "提示",
-                    "Message": "该任务尚未添加成员，是否立即添加？",
-                    "Type": "warning",
-                    "ConfirmButtonText": "确定",
-                    "ShowCancelButton": true,
-                    "CancelButtonText": "取消",
-                    "ShowClose": false,
-                    "DialogResult": "按钮结果",
-                    "AdvancedSettings": {}
-                  },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                     "ConditionAndCommandPairList": [
@@ -605,28 +574,91 @@
                         "Condition": {
                           "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
                           "param": {
-                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                            "cellLocations": [
-                              {
-                                "SerializeProperty": "='任务-工时'!按钮结果"
-                              }
-                            ]
+                            "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                            "tableData": {
+                              "TableName": "任务平行视图",
+                              "ColumnName": "成员数量",
+                              "GUID": "6d56483e-74b7-4690-9382-70a314118cca"
+                            }
                           },
-                          "value": "confirm"
+                          "value": "0",
+                          "compareType": 2
                         },
                         "CommandList": [
                           {
                             "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                            "PageName": "参与成员管理",
+                            "PageName": "新增报工",
+                            "PassValues": [
+                              {
+                                "Source": "实际",
+                                "TargetCell": {
+                                  "SerializeProperty": "=新增报工!工时类型"
+                                }
+                              }
+                            ],
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "d1782cbc-ac80-4465-b355-babb64cf05e5"
+                        "ID": "d9ad2699-d1ed-40ca-a99c-091caa89726c"
+                      },
+                      {
+                        "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": "7ee26078-8f0a-4c90-9613-5d4522e38360"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "8bcbceec-0ed0-4840-83ee-f3acf9c1b95d"
                       }
                     ]
                   }
                 ],
-                "ID": "fa6f5474-12a1-4188-8c5d-f619a809f1a0"
+                "ID": "f4fcf041-4aa3-44e6-88ca-4feefd3f9a45"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "FourStandardStyle": "warning",
+                    "Message": "当前任务状态，允许上报工时"
+                  }
+                ],
+                "ID": "e49b92dc-48b3-4332-a0f3-ec671720d15b"
               }
             ]
           }
@@ -857,7 +889,7 @@
                     ]
                   }
                 ],
-                "ID": "fe722408-692d-467d-ae1b-e8dc730115c2"
+                "ID": "ecb540a6-e3b0-416d-8bca-58f8500a88f5"
               },
               {
                 "CommandList": [
@@ -877,7 +909,7 @@
                     ]
                   }
                 ],
-                "ID": "44d02e26-89d6-4e15-aea8-d342ffa855ab"
+                "ID": "d724e1e3-94a6-4fe9-9704-40e96081efea"
               }
             ]
           }
@@ -1204,4 +1236,4 @@
       "Formula": "'任务-工时'!$V$14"
     }
   ]
-}//B0xLCEWMt39SeXYRr1TEbpr2rar4+hn7CwXirqPY0TIsx44UKMS/uUppxYeIryPXZOBTLOuTkYS1WcXz6KenhVDobCsFDYAr2ynL5+gR3ZR0ktQRQvqCWWrIX7nM4PYP/o7wGc6V+5m0I0ByhkzEI4qIZRNQZH4Lf7QMJ/cRhmYHRSnShWBGBsl0bzq9sgZO/iaqXdQNLj9iCdPEjhOm8SiFaVc+GD0PB0oAJJBvvcsVHuy5YmsbwSxEr6i6qvOneDIWZWBzjC3jK/oUnvu+glG3B/yYzoF3j7Vw8uA5RVbZn3oqiVusLRMG3Y852rxNdCPt/1Q2rWjnfoFT7OmcJ4JqRfhomKyGUA1Mqjfh9BHY8LxULhZTQQSKW9sYzPnBS2rSUSsZH936iGHFDHZTzhS5F+wz0j/jrVB/2NGLlg1MT58PiadXx+euBWbA8z6ZxDVYcGb2uUOK6OdjO9j/uylCZuWrWEXyjglWqgZc286lGO+HQc9bJSRtwgZ4VveofCHMHO1w1bAOKgv6C7t7pCHI88HaXaQKZg1lLPIgi23k8isy2JvxwpwpqI/TiALZwH8TttjJF2Nkn4ycePR+xPM3u8ROI7bxd1ABqWbQDsh8LU82TeEM2eMBlAQkvj1IMhaOasmgLcq/AqU6n1Q/Uj9L4UU7S32qm1FPbB5teL9xTNdaDyTTDcotGGwEhEDWzHYaSV6QQXMXnEVXdf6qrOtl6vYBiZPbjXxdmRQfLWNF/5wc1SwqyyEBOjfyfYXlhRDBsOlraF1MUTMeGgWLO2aZeAKe/zut0i16HA/1J1Ps+IQ8q2bRdD0ZcpPKttTePK3fySwUMGV9rsKD5EgnFSjiGx0IJ8Z6xmZu1iErI4m+c2/cETSGGMq7EoTKdnz/mVY6oNUux2r5tfEgM+Omvw==|920
+}//JQPc71PBCD9BMBWCDIse7VTc1DBGR/ymlfA6OXy63dAuy4uRv2fDnXTHcCYDWxklGIve/bTjyEJRJuw5Eoqd9EJvgEKnt/8oBEZI+GWBczZ1x1XAg9PnUlFjnrEUTc2zKtPy5J1KOfZlksavQQMrYqsVGmvGFcm0hydXYjuPZ4y9QbmUAiGM1CxJCUQJF9DSJqGWQqPvDVpuv6AY3pax6qQuWXnJsjTZ7mG9t/KLF9NlsFapp3R8mhIsdFggeNFiFCgXXeRpNc1DWkpDzPqq5MxHec5V2PaEY7LpFqSWGiAABSKVzyrHTcE+WagtcmT7LAAzQQQAUk+Z751ipDGW1m8jfJH4JU2RX9FFBx0j/NeTcAK6OLGRJCEB0pqEb0pKjlbVNGgfROMReg4tCN0jSUL0xSsZ47Q2ER3affOYMWEjah3K0YL5B0XiZ7m3YHrKvtzLJbDr4LK1v9NVrAOvYCWRGJujjWRgKR8ldaIVLhChf5n3ZtT7KnAl80e40mwngJGVLsZbBsu2DXnR6o+DtHGCklvSKYBhnKseTjPqQ3MRuDVi2zfqpn2L62j+zDhn7KKSRDppqW9TnRjzwkFQRJHMdxvZVEqHhywHHYbs3znBHutNWNYUqNtJ6nKKWzkuXjRbkSDgmve7yssN7XrgF9Fn0D9FiZyuvVO+ZVD2nl9HlfWdWF1CfGoodkvZLsX1NXJ2X2vIaaKEIjID++P/OQQqIqLt1WkpOyehuZQMgojLmg7kArZlWvvQbNFdexHw6X0k+ksbr3tTyK/IIJmXj2CpKvknxjU7LXz06LI2qQjMbYesX01pbeVmSmNZrd3/ZySmoZIlIhH8voPOfdNWwygjxpHcBC8wUsDTZMI5M/LHD3y0BZK8w5qAjPTXUBxvpT773ELd01Wpq4SJPemgsQ==|920

Pages/任务/任务部分.json

@@ -25,18 +25,21 @@
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 5.0
+          "DesignLengthInPixel": 5.0,
+          "IsHidden": true
         }
       },
       "5": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 5.0
+          "DesignLengthInPixel": 5.0,
+          "IsHidden": true
         }
       },
       "6": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 52.0,
-          "Mode": 1
+          "Mode": 1,
+          "IsHidden": true
         }
       },
       "7": {
@@ -104,6 +107,11 @@
         }
       }
     },
+    "InLogicalVisibleIndexes": [
+      4,
+      5,
+      6
+    ],
     "Count": 19,
     "DefaultSize": 5.0
   },
@@ -706,10 +714,55 @@
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "PageLoadedCommandList": [
       {
-        "$type": "CloseCommand.CloseCommand, CloseCommand",
-        "PassValueBack": true,
-        "ReloadData": true,
-        "PassQueryCondition": true
+        "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+        "ConditionAndCommandPairList": [
+          {
+            "Condition": {
+              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+              "param": {
+                "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                "tableData": {
+                  "TableName": "任务表",
+                  "ColumnName": "任务状态",
+                  "GUID": "9cfc198e-05b6-4e96-907d-504db33e9079"
+                }
+              },
+              "value": "2"
+            },
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+                "PropertyItemsList": [
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=任务部分!5:7"
+                    },
+                    "Value": true
+                  }
+                ]
+              }
+            ],
+            "ID": "4697109e-6c9c-4179-8376-36b1b99154a1"
+          },
+          {
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+                "PropertyItemsList": [
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=任务部分!5:7"
+                    },
+                    "Value": false
+                  }
+                ]
+              }
+            ],
+            "ID": "cfb64db2-78d5-4154-888b-91eb4f5be178"
+          }
+        ]
       },
       {
         "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
@@ -744,4 +797,4 @@
       "Formula": "任务部分!$A$1"
     }
   ]
-}//4FyWMhvyT9N0XvLI9P2dZBZoyBgtMKny7xpUzJ6dt/UGOIDfQCWJeWKkl/cjPWA4skKo2DWQx8JbZ0GX+bgpdhNFICfmGgqS6GW55HIOmZy2fG7aGKXzrIhY3O8cihuosiMrqCoGScS8m++JE4++RIxQp8pIVzC9sOE63uoYJky5OJz8ZrbHizHThSEbJrMXGHON2ZKRzMEc4PSJG9tcZAkU4ijIcjk7EFgYy+t5J79uekF/3DDiWWN2hr4FXRm6zMQAcEziKmNKJv/ym4HkZhUHCcHJUgUkJJPwwpfuH2f/okMCtL1JIjuFWeGHBb4+0obisCLKE3MrLimK3cOyuoyLZKqmgR3KkCDXMIyvI70Jv2RKFNyO6tJtuka7JSrz0BhRWZoKwT3MOzWEDognTN8KhoDe4g57zutpJHzGGX5x1o6J5LrOLC1rhFzupOQxAVbqkoOuUq1V3UxKtKue2yhRomI4uWIyPGqIYH44LUqRtfBy8jGKkGsL9Mctp7BgH42M4BNY31nX/LsvuVKy9ejsJajBxxNTaw/PXxDEe5TY+4DbgoR45PhMfvKzSZIT62wLRVjq9EYto/AzXqfkqICTlEXcPAtHY76ciAttkxyohmtYHYN3vv4HUWdydQdOHKlbSLzIA29sQz1ZuSQuuOMVrK0xYWD/bZXxv5iMw2rYupZ3CRSJwGTz0KxoF+IBC3eltPgen/vhTwLRI8Fq6SeqG7Ya/cO1FnOLUn5/KkIW8zAHdRLbsHRPjTwoQPqbNp9JdyKX23Vs+2o3QIVMdy811eKLU5NP+eenVBq03guEw3QjD10oyx6NIIcsZ9to9mu3CyIwEOJq/YhDcClkVQA5UuqWmyiJ2fVpxaSupfc8maYAjGePfUFNnsGYcdrkIy/eTiXgs0ApA2Pq33Y2AQ==|920
+}//rL8W1m8lENUizVdfeeZcujpp4a8dNbfmgd8630fobvC4WjfmrsAioZzMaK+x6E2N2zQFD1xNjmA0eI6AqeclxXyxQJHGo3w9ieML6/L4Poq9MfLiDlBwqjAwN0Ttsc7Nhp711D2rFJq+26XpmFwqZNGyGnX94No5vRdPWTSxuFob3uHhhgPNEzWl/6IvXb5YdCYojS/DPZ+zoT14KBnaQguU7yKZEcva67EufWZFiyRWELPPIt963gpc37hmvmDhQgnmiqbs7GDzzTBjyjJyXuJeMjxuL1oLwQbQzesXvVcdlI4TKHggUKDJF1gMUR33C5MeIzpmOIxm0lcc9Nmrluc69hOWebTH4H+F3CcmEMSgrQ9ThV7X8k2JqfxnacBVNKcxIBgorb3lZUirWEy9cxUUJ1bNmZlsRBEsEBvFz6LARDXIDRqrEwIFbH64fy7Sog920AgPmVhmQB0FaCkqWUvTuHichdj0gD9kpaeDRrB+oTxRQVJyjVNU5+CdLdUe1wfiYFN5e/uhqLSoGzqCLtwmsvCU0Y8RSCaJhENB6Y7YVhaQLtokQtlaO2ezTTCm74VmOYROOgr29guYFZBR5NKGMESfCP5HPTTIQVNNYgiVQ29dwPgRfmv4FUQ20j97ceUCteBD4w3ifC9OZkTVuh5y2NdWr88bG3/4YtyJ8YEAHFSLSOdbUsOXOnXVAINteIPq7apVhHfm8bibi/7fzrB2S90zVsctayzFGuUDZLuNZmdMVkvOZNzUioTvk1ESLRs5qWbozxw6ArXDW/Yi94CwcuF1wjQAh0CVZaqXNpor/b3x3CqskRNOETyGrVKeh66ezEp7bbY0a9e+6F/LoJFsfHqbljKlNT/hE4jp6rRsRFM4xQHsDansRUqD7ReOWjAvVlf2tIrneH5z4rmI0A==|920

Pages/任务/任务首页.json

@@ -302,8 +302,7 @@
             "ResultMessageTo": {
               "SerializeProperty": "msg"
             },
-            "RefreshAfterFinish": true,
-            "CheckDataValidation": true
+            "CheckDataValidation": false
           },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -341,7 +340,7 @@
                     "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                   }
                 ],
-                "ID": "ff901f56-53fa-45c4-9001-cfef1e38f1fe"
+                "ID": "7d7a077b-3e88-4c52-b75f-40c3b7b41772"
               }
             ]
           }
@@ -465,7 +464,7 @@
                         "PageName": "FGC_审批记录"
                       }
                     ],
-                    "ID": "af1aaa6b-a9e0-434c-8aa5-b45dbcf50e28"
+                    "ID": "7ab673fb-4bb7-49d7-86fd-a34b0b225751"
                   },
                   {
                     "CommandList": [
@@ -525,7 +524,7 @@
                                 }
                               }
                             ],
-                            "ID": "7cd1c9bd-43f7-4f50-aa4f-386aac072b9b"
+                            "ID": "dc1333ca-ece3-419f-a059-ae77b09643b9"
                           },
                           {
                             "CommandList": [
@@ -538,12 +537,12 @@
                                 }
                               }
                             ],
-                            "ID": "401991ff-0de5-4dc3-b65e-ca6c5d0a5980"
+                            "ID": "b8064771-8571-467a-b6a6-75d2898ea839"
                           }
                         ]
                       }
                     ],
-                    "ID": "f4ad1336-6398-49bd-9295-ae3f74e5a2b1"
+                    "ID": "0979af3d-8805-43b0-9425-7046db992b7a"
                   }
                 ]
               }
@@ -658,7 +657,7 @@
                     }
                   }
                 ],
-                "ID": "6d4edc62-669d-4565-a7cd-c47c99fc44a0"
+                "ID": "e7e0eb27-5f64-40ba-8a47-7bc7da4b8e2a"
               }
             ]
           },
@@ -699,7 +698,7 @@
                     }
                   }
                 ],
-                "ID": "3bf48fea-c043-420c-94f3-e35ad6f7ac6d"
+                "ID": "cc334536-3b98-4ffb-9340-c8c1c971fc50"
               }
             ]
           }
@@ -761,7 +760,7 @@
                     }
                   }
                 ],
-                "ID": "28ce3342-5cfc-4a31-bc81-5a07f3ac0f32"
+                "ID": "1799cd8d-3e55-4fbf-a27b-47d9ddeca313"
               }
             ]
           },
@@ -802,7 +801,7 @@
                     }
                   }
                 ],
-                "ID": "1ee58d86-8593-4294-a392-71c18bb6834a"
+                "ID": "b3b13984-bd90-4d0c-ad27-a906e1a9cbae"
               }
             ]
           }
@@ -991,7 +990,8 @@
                   "Value": "%CurrentUser.UserName%"
                 }
               ]
-            }
+            },
+            "Disabled": true
           },
           {
             "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
@@ -1482,4 +1482,4 @@
       "Formula": "任务首页!$S$8"
     }
   ]
-}//bTi/QJ7Z7HXY2SbxTZCZ1YEOxhXp+Bjp0lP3QgiYohtSWcnaQhBZtPW/wZgjf+wYNyUGdY+Zi2+BI20oSDbapBx9I8BqkDhXWjzaGzcUEljUNW5GW+Aqo55Uk+R4IbuYRqKxKm3JaJ6fdnfZWfvsHkbWsVDXPIREGLeBZvpR12RLsRAYm9w4uTeIaNxWt23JbC4wJp1cfMSmySpXsfB3GOpeNzKQzmWu+oQ2WpSIZRANuEPIIa3RHtEUQd9QWSwcpMILMsroAeftBWVayQUFWKwji3+4gsPk1gztn16h/v5nY4/lGoDRzSk0wOsaBJwl1XR0DIJO8sOXuE2xwckGhCvcqTf6UZ2dnYut2dqlDAfaxCC5/9tEnU/rQn6Nq043Qc4qYz2OztDyQWv/Uz+sXIw60XAUOg482yDq36UF+hu92/cZh4VK2hICagsWyHjOYemKgf8GXQc3ty1bn0VJizW/Rto7kCBY7eEpIPpxEXHWrysAkY7kKm2mnupvb09UP6BLpveWbaBSPISYCbBFyBPDPH5BamASm+aZtLLvzYgRphd0BvUPWHlpDLty/wV03pbv3imaMMG8r2lTU+G5R/H3tocoC80nXODkvGo+eg2DJqZ4ILMMVjWyN+kro26Uqmbx90W0Aw5qtPAWKAl/B2wHHaOJTKZMELbrERGunA7RrNiJf7/Cff5vZmDc58y9+PAdtTNOxD1jV9vNFoUsyROBcbtaFU832mANlqwv7zzkgaJB3JKbi0DFQePN7Lz5uxIIgKnRcWedGCxhhS8iQ+THa2FmuhTUwmuvq47rAWrqsF+5OoZhwwnmHSzUNuy2mHtrx4JAtoAG+ZPDFBdxWgAHIoG9Mqn6bLg4jC7r3pbgy6HTA5uWY2OUJSO2iW3EIekAAIjiwWqhwG67ZdMCUg==|920
+}//cpyfngDPy63Y7rLS4qE76J5jB2gUEZPl7VMuC5lCyK/nUsiYrkHJRJFNkTjFxt9o5Cp0j9q4xmNAwQ2XePHk06NXD1SaP4umSpRwti9rM635JJVKQQKqSHpCMDU9PzqfY6qKN5HF+CclGcrPDcOklLztPFN8jNrHF4/MdVmJSUWyV5bHSuXHflqd8erhdu0xexCX0R6GHD95FqI1c/fyfS6zQUHrnQnWRcJyChUwBGYYmoLlq+2gfP7B2mcTEuXPeVZeduj6al8sdMAXEKW2QNeJKb0B8YqqkOuJai11ySWclwXAsoR6GEE7yQELXyQkwjqziocVoj2v1KbqOukzxY99DOBQXYSHMw55u8UX2dPUA1Ja2tAUCOmW7pWsBFTIL6GYMVbhT16pm4uwbuGMAEwb/R+VHFbBQcHqd/J4mkqm90U5kEAX+9d61BnD+It6JcrfltRZqh13e5ChoyuKGB51n1pSxDzv3vMnFqa7v3F52Lo3XjDSF8GAzKaio46+GI2xuW/p1mIzjR5z8vgxc8Jvg5WUXcl+eNUobwd2k5sr8XD41PB52BwAfuKcyoRu0eWagcR1n+lmWDak0vsdhNphozsu7fxBOJZLTlV49MNIgjBn7QVFAbpWPyrdwPUHtu+sv9xYuo/W3256fLrJPvgjy2IVFWzAOMmISEQXnLdtEsQSahhn85g0ZSQxnGL/BSmNgg6/7xlE52r2lmLZvHYhhXW+O2ka+PrFsRsEIN++bKLLsUiOMBkVXu9Qo6x5MWcurNUCMXnV5e5wLsQqUBpkSC2cyrdTFdR7hwoj2t7yJF01Gx0uAbyFcj284i/F6cTMfdF7j0DhgR8FcqkFMGMVHxjAs9bgywKi9TYXNA8Jgci+kCqUdNQJBEf5minDUBQ0gT/fXnZPvL0TTKr99Q==|920

Pages/任务/新增任务.json

@@ -148,9 +148,10 @@
       }
     },
     "InLogicalVisibleIndexes": [
-      31
+      31,
+      32
     ],
-    "Count": 32,
+    "Count": 33,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -260,7 +261,8 @@
   "Formulas": {
     "3,13": "项目是否开启反馈收集",
     "9,1": "H32&\",\"&K32",
-    "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
+    "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")",
+    "17,14": "父任务剩余工时"
   },
   "AttachInfos": {
     "3,1": {
@@ -496,7 +498,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "12558968-9d63-46c8-b8e7-54bb4deccd20"
+                      "ID": "2527a371-17a9-4e71-bc39-169620d34b3b"
                     }
                   ]
                 }
@@ -606,7 +608,10 @@
       },
       "DataValidationInfo": {
         "IgnoreBlank": false
-      }
+      },
+      "RulesGuidList": [
+        "01a7e9a0-5381-45fc-a8cd-737703885026"
+      ]
     },
     "12,9": {
       "BindingInfo": {
@@ -738,7 +743,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "8a40a902-4ce1-482a-94b1-d020a955b6c4"
+                      "ID": "dd4648dd-ded5-4683-8455-6dca0adf1ffe"
                     }
                   ]
                 }
@@ -1059,72 +1064,139 @@
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
           {
-            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-            "TableName": "任务表",
-            "UpdateType": "add",
-            "ShowConfirm": false,
-            "UpdateBindingValues": [
-              {
-                "BindingInfo": {
-                  "TableName": "任务表",
-                  "ColumnName": "任务状态",
-                  "GUID": "eeaad282-2aed-46ef-b24f-a356127d8862"
-                },
-                "Value": "0"
-              }
-            ],
-            "NextUpdateDataTableCommand": {
-              "TableName": "任务成员表",
-              "UpdateType": "add",
-              "ShowConfirm": false,
-              "CheckDataValidation": false,
-              "ReloadAfterSucceed": false,
-              "UpdateBindingValues": [
-                {
-                  "BindingInfo": {
-                    "TableName": "任务成员表",
-                    "ColumnName": "项目ID",
-                    "GUID": "aa78d2dc-7c4a-4ce4-86b9-3fcbdc24106f"
-                  },
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=新增任务!项目ID"
-                  }
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "任务成员表",
-                    "ColumnName": "任务ID",
-                    "GUID": "d4ec9380-0922-4477-b4ef-358d88c42d46"
-                  },
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=新增任务!任务ID"
-                  }
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "任务成员表",
-                    "ColumnName": "任务成员",
-                    "GUID": "d0a4b060-7138-41fb-9f01-e13ac1e133c3"
-                  },
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=新增任务!任务负责人"
-                  }
-                }
-              ]
-            }
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "Title": "加载中"
           },
           {
-            "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
-            "ProcessDefinitionResourceName": "新增任务流程",
-            "ProcessInstanceName": {
-              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "=新增任务!B4"
+            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+            "ServerCommandName": "新增任务",
+            "Parameters": [
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "项目ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!项目ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务名称",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!B4"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "父任务ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!父任务ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "负责人",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!任务负责人"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "开始日期",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!H32"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "结束日期",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!K32"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务分组",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!任务分组"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务类型",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!任务类型"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务版本",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!任务版本"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "预算工时",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!B19"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务说明",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!B23"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "收集反馈",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!N4"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "备注",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增任务!B27"
+                }
+              }
+            ],
+            "ResultErrorCodeTo": {
+              "SerializeProperty": "code"
             },
-            "SelectedTable": "任务表",
-            "ReturnResultName": "发起流程结果"
+            "ResultMessageTo": {
+              "SerializeProperty": "msg"
+            },
+            "ReturnPropertiesTo": [
+              {
+                "ResultPropertyName": "任务ID",
+                "ResultTo": {
+                  "SerializeProperty": "新任务ID"
+                }
+              }
+            ],
+            "RefreshAfterFinish": true,
+            "CheckDataValidation": true
+          },
+          {
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "FunctionName": "remove",
+            "Title": "加载中"
           },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1136,40 +1208,101 @@
                     "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
                     "cellLocations": [
                       {
-                        "SerializeProperty": "=发起流程结果.ID"
+                        "SerializeProperty": "=code"
                       }
                     ]
                   },
-                  "value": "%Null%",
-                  "compareType": 1
+                  "value": "0"
                 },
                 "CommandList": [
                   {
                     "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                    "Message": "操作完成"
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增任务!msg"
+                    }
                   },
                   {
-                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
-                    "ReloadData": true,
-                    "ClosePopupReturnValues": [
+                    "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
+                    "ProcessDefinitionResourceName": "新增任务流程",
+                    "ProcessInstanceName": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增任务!B4"
+                    },
+                    "SelectedTable": "任务表",
+                    "RowsToUpdate": 1,
+                    "RowsToUpdateCondition": {
+                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                      "ColumnBindingInfo": {
+                        "TableName": "任务表",
+                        "ColumnName": "ID",
+                        "GUID": "397c3b0c-f443-42e7-9954-31dcf859e7da"
+                      },
+                      "Value": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=新增任务!新任务ID"
+                      }
+                    },
+                    "ReturnResultName": "发起流程结果"
+                  },
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
                       {
-                        "Name": "任务ID",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=新增任务!任务ID"
-                        }
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=发起流程结果.ID"
+                              }
+                            ]
+                          },
+                          "value": "%Null%",
+                          "compareType": 1
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                            "ReloadData": true,
+                            "ClosePopupReturnValues": [
+                              {
+                                "Name": "任务ID",
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=新增任务!新任务ID"
+                                }
+                              },
+                              {
+                                "Name": "关联页面",
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=新增任务!发起流程结果.Page"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "361f4438-d6f9-4a3d-aef2-6c06857d5cd4"
                       },
                       {
-                        "Name": "关联页面",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=新增任务!发起流程结果.Page"
-                        }
+                        "CommandList": [
+                          {
+                            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                            "FourStandardStyle": "warning",
+                            "Message": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=新增任务!发起流程结果.ErrorMessage"
+                            }
+                          }
+                        ],
+                        "ID": "689c98f6-5425-4f7d-bbb7-808cf158cfca"
                       }
                     ]
                   }
                 ],
-                "ID": "fbf575b9-9190-4593-ad74-ef80d43f9b46"
+                "ID": "dc9361ac-9503-4d9d-9096-65aa168184df"
               },
               {
                 "CommandList": [
@@ -1178,11 +1311,11 @@
                     "FourStandardStyle": "warning",
                     "Message": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=新增任务!发起流程结果.ErrorMessage"
+                      "SerializeProperty": "=新增任务!msg"
                     }
                   }
                 ],
-                "ID": "8254f0f7-183e-40bd-adbd-c9b4add9e0a5"
+                "ID": "5c91d120-0f6c-4ede-a324-64aa8ccbeb03"
               }
             ]
           }
@@ -1191,13 +1324,6 @@
         "TemplateKey": "_RS_Main1"
       }
     },
-    "31,1": {
-      "BindingInfo": {
-        "TableName": "任务表",
-        "ColumnName": "父任务ID",
-        "GUID": "cccaa787-e255-4f32-baf9-5a3d1b09189a"
-      }
-    },
     "31,4": {
       "BindingInfo": {
         "TableName": "项目表",
@@ -1225,6 +1351,13 @@
         "ColumnName": "ID",
         "GUID": "ab7e6f36-abc4-48e6-a075-cf361ca3bf6c"
       }
+    },
+    "32,1": {
+      "BindingInfo": {
+        "TableName": "任务平行视图",
+        "ColumnName": "总剩余工时",
+        "GUID": "860df42a-372a-4db8-9676-311a5a2eea68"
+      }
     }
   },
   "StyleDatas": {
@@ -1285,6 +1418,12 @@
         "HorizontalAlignment": 4,
         "Underline": false
       },
+      {
+        "FontSize": 12.0,
+        "Foreground": 5,
+        "Formatter": 8,
+        "HorizontalAlignment": 4
+      },
       {
         "FontFamily": 2,
         "FontSize": 13.333333333333332,
@@ -1316,7 +1455,7 @@
         "Formatter": 7
       },
       {
-        "Background": 9
+        "Background": 10
       },
       {
         "FontSize": -1.0
@@ -1332,6 +1471,7 @@
         "Text 1 50",
         "Background 2 0",
         "[AUTO]General",
+        "\"父任务可分配：\"0.0\"h\"",
         "Background 1 -15",
         "#FFFFFF00"
       ],
@@ -1340,7 +1480,7 @@
           "Color": 6
         },
         {
-          "Color": 8
+          "Color": 9
         }
       ]
     },
@@ -1415,6 +1555,7 @@
       "17,4": 8,
       "17,5": 8,
       "17,6": 8,
+      "17,14": 12,
       "18,1": 4,
       "19,7": 4,
       "19,8": 4,
@@ -1445,34 +1586,34 @@
       "21,10": 8,
       "21,11": 8,
       "21,12": 8,
-      "22,1": 12,
-      "22,2": 13,
-      "22,3": 13,
-      "22,4": 13,
-      "22,5": 13,
-      "22,6": 13,
-      "22,7": 13,
-      "22,8": 13,
-      "22,9": 13,
-      "22,10": 13,
-      "22,11": 13,
-      "22,12": 13,
-      "22,13": 13,
-      "22,14": 14,
-      "23,1": 15,
-      "23,2": 16,
-      "23,3": 16,
-      "23,4": 16,
-      "23,5": 16,
-      "23,6": 16,
-      "23,7": 16,
-      "23,8": 16,
-      "23,9": 16,
-      "23,10": 16,
-      "23,11": 16,
-      "23,12": 16,
-      "23,13": 16,
-      "23,14": 17,
+      "22,1": 13,
+      "22,2": 14,
+      "22,3": 14,
+      "22,4": 14,
+      "22,5": 14,
+      "22,6": 14,
+      "22,7": 14,
+      "22,8": 14,
+      "22,9": 14,
+      "22,10": 14,
+      "22,11": 14,
+      "22,12": 14,
+      "22,13": 14,
+      "22,14": 15,
+      "23,1": 16,
+      "23,2": 17,
+      "23,3": 17,
+      "23,4": 17,
+      "23,5": 17,
+      "23,6": 17,
+      "23,7": 17,
+      "23,8": 17,
+      "23,9": 17,
+      "23,10": 17,
+      "23,11": 17,
+      "23,12": 17,
+      "23,13": 17,
+      "23,14": 18,
       "24,1": 4,
       "24,2": 4,
       "24,3": 4,
@@ -1499,34 +1640,34 @@
       "25,10": 8,
       "25,13": 10,
       "25,14": 8,
-      "26,1": 12,
-      "26,2": 13,
-      "26,3": 13,
-      "26,4": 13,
-      "26,5": 13,
-      "26,6": 13,
-      "26,7": 13,
-      "26,8": 13,
-      "26,9": 13,
-      "26,10": 13,
-      "26,11": 13,
-      "26,12": 13,
-      "26,13": 13,
-      "26,14": 14,
-      "27,1": 15,
-      "27,2": 16,
-      "27,3": 16,
-      "27,4": 16,
-      "27,5": 16,
-      "27,6": 16,
-      "27,7": 16,
-      "27,8": 16,
-      "27,9": 16,
-      "27,10": 16,
-      "27,11": 16,
-      "27,12": 16,
-      "27,13": 16,
-      "27,14": 17,
+      "26,1": 13,
+      "26,2": 14,
+      "26,3": 14,
+      "26,4": 14,
+      "26,5": 14,
+      "26,6": 14,
+      "26,7": 14,
+      "26,8": 14,
+      "26,9": 14,
+      "26,10": 14,
+      "26,11": 14,
+      "26,12": 14,
+      "26,13": 14,
+      "26,14": 15,
+      "27,1": 16,
+      "27,2": 17,
+      "27,3": 17,
+      "27,4": 17,
+      "27,5": 17,
+      "27,6": 17,
+      "27,7": 17,
+      "27,8": 17,
+      "27,9": 17,
+      "27,10": 17,
+      "27,11": 17,
+      "27,12": 17,
+      "27,13": 17,
+      "27,14": 18,
       "28,1": 8,
       "28,2": 8,
       "28,3": 8,
@@ -1539,21 +1680,32 @@
       "28,10": 8,
       "28,11": 8,
       "28,12": 8,
-      "29,1": 18,
+      "29,1": 19,
       "30,7": 4,
       "30,8": 4,
       "30,9": 4,
       "30,10": 4,
       "30,11": 4,
-      "31,1": 19,
-      "31,4": 20,
+      "31,1": 20,
+      "31,4": 21,
       "31,7": 8,
       "31,8": 8,
       "31,9": 8,
       "31,10": 8,
       "31,11": 8,
       "31,12": 8,
-      "31,13": 8
+      "31,13": 8,
+      "32,4": 21,
+      "32,5": 21,
+      "32,6": 21,
+      "32,7": 8,
+      "32,8": 8,
+      "32,9": 8,
+      "32,10": 8,
+      "32,11": 8,
+      "32,12": 8,
+      "32,13": 8,
+      "32,14": 8
     },
     "SheetStyle": {
       "FontFamily": 2,
@@ -1566,7 +1718,6 @@
     "9,1,1,14",
     "14,13,1,2",
     "11,13,1,2",
-    "31,1,1,3",
     "12,1,1,6",
     "5,5,1,10",
     "12,9,1,6",
@@ -1583,7 +1734,9 @@
     "31,7,1,3",
     "31,10,1,3",
     "31,13,1,2",
-    "29,1,1,14"
+    "29,1,1,14",
+    "32,1,1,3",
+    "31,1,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1615,7 +1768,7 @@
                 "MethodName": "Focus"
               }
             ],
-            "ID": "38995bb1-b541-498b-a4cf-989753c60a41"
+            "ID": "b856e798-0d7b-4f7c-b79f-fe84316d09aa"
           },
           {
             "Condition": {
@@ -1649,7 +1802,7 @@
                 ]
               }
             ],
-            "ID": "936b40b8-1ae5-4579-b9a6-e6a49f1d5840"
+            "ID": "f3fba1a5-03eb-47b0-916d-b77d281b5b94"
           }
         ]
       }
@@ -1670,7 +1823,7 @@
     },
     "RowBreakLines": [],
     "RepeatRangeSettings": [],
-    "RelatedDataTableName": "项目表",
+    "RelatedDataTableName": "任务表",
     "ConditionFormatRulesCollection": {
       "Rules": [
         {
@@ -1703,6 +1856,22 @@
           "IsDisabled": true,
           "IsInvisible": false,
           "IsReadOnly": false
+        },
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=新增任务!父任务ID<>\"\""
+          },
+          "Priority": 2,
+          "GUID": "01a7e9a0-5381-45fc-a8cd-737703885026",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": true,
+          "IsInvisible": false,
+          "IsReadOnly": false
         }
       ]
     }
@@ -1743,6 +1912,10 @@
     {
       "Name": "任务版本",
       "Formula": "新增任务!$J$16"
+    },
+    {
+      "Name": "父任务剩余工时",
+      "Formula": "新增任务!$B$33"
     }
   ]
-}//QkD4e7oyR+pLUhN2QPbyBUL5dJC7ObLehKGcgFhqxNApauq2FLy3ZKSjgN80GiBiM7d07GC9H8yy1q23TCNAb7iD2dP++qBkHF4PfFkPklNI2zBMK7OxJIByT6O1Q6KuGIddoS8hdp262eDc+ZKx3xPvPM3W09B8RW76F2269YfKNVmiyAox8FdfurHHv9TQw+KsF0eqRjZnGuKKxm1Ib0fUHQ2j6vdSVxYZt7ELKkKQgLCcY7s4KRXE7wqJOuUh/Dm8OZ8tIRO3mkU2Z5gsK/tqqqZS49Lfn7J78CLCOS4k9dLH4QlCbop2uaqqP9dLEe973NYHecxZgbzObJdoAgoYAbTC3k9N7KvJtTxaRgMdTT2K6BfpZ6d0nIdFsJ47l7/NQVBjbZipdCx07qM98phQ5TYymGDSLnLWPvNjA3SeTi/uyyniWBpad1CBolHRlw4oa/Bh7QaEGTloeASwwnTHav3g+K+YMzcXRog9CnTFyo7VdE1vTC2jgAEHqGhp3cHnRLnVWd+hahiiMfOhXDPSm6KdyYv8/geffooLfzMp4AiMvlZPqmhT9Cw3iD8vX8c8RPQ7WMw62g1ZOYI4a/SZ/Ln+dyuJIFYGTPZR58VLce52fhnQ2WCQjVcNxbk1jRgZq6S/zK4Zmx/4O/85UeJADzpzMiLyGfxC0sG35Rn9RXEJgDoKUVMG47SoZDcjMOc3fwbYUBca2rKdpc/hOzyRV6SHgJStJWq/LQi8IxJgyJ76wChjdVQj3cm+vi2RprJxbPZnO0PXbAdGTHnLPbHSFpmJqZs8T6bvTqzT78oqL1T8T+WFywVIyxnAtM7bahlGkZXZakniAGQoyCjIbQDBOlhsXtK/jo7yYmZ36lhFQS1+kDkkPGc7wRUig0OZEN+E6R5yFqDFRImOX4gs/w==|920
+}//epNlRS+tQ57M9P33PxfLoerORScUrpUpzDrY1fo/vrkMVvIJ10fs8+8OjZ+NjQjyuIxDuSwN5YNutLHxz5DrXGDmpmPpNjcBibh3c+Grq3Dy3frjpA/niDIOMnHkFydQNpsHFWWHbqN7D69Uz7PCpyEFQjuRMtX9rRJdT6BthzqqyqEkUecrrcnXyLtgI1goameXqvYUo4EYLHNufjV0l/S/JXlhI6axzZOeRhIHBKdaVVcbf++TQGPuBkOMbrJHNPfXZF0ysm3bUJCe/bvQND8Mzg7TkSW8wFb/4p0ZmObOfbmdtIBKmfbrTJ/QliO+g0Ht11o8fPjZBOiiIs/Fjv0xF9XFV68sPMtAQtulBMmN2rnEXyUb2Srzos5s0+gMIcEeBah83xBp8/xW+N4JAURxQ8pjRf8w5RQtDQ5aRn3IfhOmTh/pb3OTJ5x92W81fF2qKVdD2NwQYiypyZzbd7hd8U4DwIq65Spi81VHu69lc759u4ZxcQ1EBmmVbq0nqUvpgeFgWBYsrqPcCOpByOklqwmEHlqyvYqr3wQ96bJpAW+plsp1mPZ+YQ2Nc/2bu6o1yJCvZD1FLqYjupy0RT3pjmvddga/nXRpldUgmh/og6m0dcqSHfP4QLVe8Rg2TdLTXncb/cbi1UJpXPq/TkKXQIKVQLYxbpnX4Q61kXQVgCWyOY0q5+Z9bQhizq87DwN00zF5phYO8/AlZBCB5j/YRZ7aet9XxXsD3E4r5mUnjW4f5rm4IRkIjgdi7ivFAzvNFtppj6ks43DWw9JJOjBakZflHsrJNC97VJigL+bzHGE1KhvNsZ6uYP/tW5sp1H/vpl4n3yb6Nhd1yAgI0eavXm8kAz59g5jcqQUeT5y1oTOOassCDWmLLPeRf9SsR1pZxy4zek87bt1yFZudxA==|920

Pages/任务/新增任务.rd

@@ -1,11 +1,12 @@
 {
   "PageType": 0,
   "ColumnCount": 16,
-  "RowCount": 32,
+  "RowCount": 33,
   "Formulas": {
     "3,13": "项目是否开启反馈收集",
     "9,1": "H32&\",\"&K32",
-    "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
+    "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")",
+    "17,14": "父任务剩余工时"
   },
   "CustomNames": [
     {
@@ -39,6 +40,10 @@
     {
       "Name": "任务版本",
       "Formula": "新增任务!$J$16"
+    },
+    {
+      "Name": "父任务剩余工时",
+      "Formula": "新增任务!$B$33"
     }
   ]
 }

Pages/共用/切换项目.json

@@ -63,41 +63,41 @@
         "DataSourceType": 1,
         "DataSource": {
           "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
-          "TableName": "项目表",
+          "TableName": "项目平行视图",
           "BindingInfos": [
             {
-              "GUID": "b6f0f878-6f74-4d45-af16-1936e3859d85",
+              "GUID": "91d06f84-bdaf-4eb8-8bd0-f838351a6216",
               "BindingInfo": {
-                "TableName": "项目表",
+                "TableName": "项目平行视图",
                 "ColumnName": "ID",
-                "GUID": "c3d81821-9f32-4033-acf3-5f69cf820b6a"
+                "GUID": "869b2d54-16f7-484b-8ebd-c9f5edd9be9a"
               },
               "ColumnName": "ID"
             },
             {
-              "GUID": "f01b8984-9ac3-4df8-8dd8-e873442e23e2",
+              "GUID": "08b3bf6c-1701-4180-82ed-353bde420c2b",
               "BindingInfo": {
-                "TableName": "项目表",
+                "TableName": "项目平行视图",
                 "ColumnName": "项目封面",
-                "GUID": "526d4fd0-69ce-4cec-ba12-83e176063060"
+                "GUID": "f32be9c2-8b19-42df-ba50-fbba486eaa94"
               },
               "ColumnName": "项目封面"
             },
             {
-              "GUID": "effdfd12-f2f6-4e29-9f10-5464a5c75d7e",
+              "GUID": "9f2c8670-0bdd-4f90-ba3d-f22adebf092f",
               "BindingInfo": {
-                "TableName": "项目表",
+                "TableName": "项目平行视图",
                 "ColumnName": "项目名称",
-                "GUID": "4595061a-57b9-49b5-8e33-c4ac21ad393c"
+                "GUID": "4265d976-1e15-4a84-95a2-e84eb58d3bc4"
               },
               "ColumnName": "项目名称"
             },
             {
-              "GUID": "d4172c8e-90e3-4ba1-85c2-cd7e93d71ba4",
+              "GUID": "fdce0b01-60af-40a0-a573-f35414f66902",
               "BindingInfo": {
-                "TableName": "项目表",
+                "TableName": "项目平行视图",
                 "ColumnName": "项目简介",
-                "GUID": "80aef910-5f20-48b8-9820-9635b43e7b51"
+                "GUID": "c1438ca5-6806-49a5-b6c7-89d1da241bd7"
               },
               "ColumnName": "项目简介"
             }
@@ -164,4 +164,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//dKAou+nerNXD+optyriUJXUwAgnuRaSkrGvb8DpsnqEHy3CL9T8RUWf18oXOVE7iZaCxlEskm9iMyqzfy9sM1afTcy9nZ5TwJ4BFjA/uzl5g9EzmR6ctvr0cAqijEaW74x/X7B0NK/Sl2D/kSd76YWA0aoXqfQlkegxD86TWALIudpBWyA31CIXc0qTsOvktgi3iIpcXmHYoBIR6dW2ys2vYsmFKoR3MoxWwonO0zKShsPETsnRYaD4DX2CG4vUiWM8aipPo5hMoPswScI7nG2Zk6cw1fTYLm/eL8fnCDCnlvFas/CnhZBX7HQoRxD5tg1sEM5S5JIr25Xzw2yHCTjf25o215H+jLaBIpdvIf0zelcYeRmWOyWWLngK6h0Xpun9kvKk0KoZ4ITmHB5hc5wY1t+AA/0bpAKzOBL69vcQ8r5eQDHw5xK4uF3mX+/IslRSVkgCTqUCBeyHNH2W7tw/d7QZkhZoKSDtMmATL0Uv7tyqQEuA98R8oUcsLmbbmlI2JM18PmyhMmMpwGCENuE308Bjuvi4d2fOKRq2Rwhh0nEt7n4sRTKiY3YWbrs37ojDhj3GMzWiHh+0pfsRFBZIP7rONOKFqlshUqA+oHbWnypXP5bsyf5cMQeEySbmHQQm2N/tva497lpE+cb3dKL0jwjPGTkbm4VxCibVSnNjD5a4d6msFhjOY8WhmxhTLxfEAhPSD5iQq0y7Mk4GjJ5hWdBM9P6U4nmSha4yYtq0dadyUzL3QNbqa/eli8krnDdQD/3woOTd2+zhTxy7D37XU1CcOaOkciNgQT2WMV2Vj34cqyerTI78iOEIzFn2r3ZSSAPLATVlXbGC+Tj8eOWW8SVwgBylpoH0BGOmCl/XmpBdetMCeEWKYQN1oyluT8aGy6rZzMt5G3gdX95DbEQ==|920
+}//3p72Bj8YZnPgsroRpeeDk6Al8eSevAiwAu9owvIeoR7S7I1yM0uw7qj+PQVJiKE/J6PPWxu4ZwiKDj7i5jFoj7slozCQiipO2SnpEoLMZCBdWBsTd6b5H7gJj5nvZEN6WmfwW50OE9uZ/myMxsbM30mcp+/jkv2hnOpuaqqtI885h5ZJ1/D8FvXoPP9u35KaJQd69D6oe9zU7n+35+C2qiJ1X3H0LddTtCAQ+58uycmMDuXc0zlsFH55zzom60+fa5qDsn259hlN5bjTQN05Ek1gst0t87TiPj6DxEchAgB/MZF7FKsd8deKOeZpFrRHzLIlQrB1ZeowQFIF7XJAv+dRcDggGqXOzIl+Pf9/rvLtKIXMpPaCZgKRcmAMyJgxjpin7BMNe4qTK8IatRYhmTJozSz5OexQ5L0BkHxGoChFiSl7uExPoD/swU3sULgoCmy+vA1eZMLiobdOYUhQx/ZI2EvI6luRZ+MfSDwiELbwB6ufzQt1sMNUT9Y0Xjy7RrF5ntb7Mi2lH6h8C/wfDfXy5JD63uNELRgtDhCX+fAYN6TCM6lKcKLZ2+n8CoVGW0yNzdj2odFMdcAyb6SM7Z3B/NvNkCehgQqd6y/Inm0NZMewi9hF27ac1IBkCeWHHxPfL8cEvi5RUw/UR2rdvD7+e1Xnf4SyBh6381yHsxryGNxiUFSerWKCnuNIntvA2ww/vgYYJbBxA1rkXxXw3BAg90oGiYdG1ZiMHMPHrSZe9sOjECYG+MQpWkBannQnnIDJRg7MAYAvGVsgzvX36taB/+slqsTS1LBaJjmvO6M7CqXO7PSX4OGjgsftsNBxvOIy2Fg6FopLC5Jy4SV5SIh+YHRM/duNPs3oZM2hvawhfZ+XbfG1kIda6HI4QqC5TZMqhPIFchzufwI6WNp/Jg==|920

Pages/项目/项目首页/项目配置/项目岗位配置.json

@@ -283,7 +283,7 @@
           }
         ],
         "type": "text",
-        "placeholder": "请选择",
+        "placeholder": "请填写岗位名称",
         "resize": "none"
       },
       "DataValidationInfo": {
@@ -339,7 +339,7 @@
                     ]
                   }
                 ],
-                "ID": "2b33669b-04fb-4c6d-8ec5-ef8005b79e33"
+                "ID": "5d2918f5-e0e1-41cc-98d6-ec378bd4fbfe"
               }
             ]
           }
@@ -370,6 +370,7 @@
           }
         ],
         "step": 1,
+        "placeholder": "请填写岗位时薪（元）",
         "controls": false,
         "IsDisabled": true
       },
@@ -416,7 +417,7 @@
                     "Message": "请设置时薪"
                   }
                 ],
-                "ID": "6b827472-9ee1-464d-84ce-6bd4d39c4bc5"
+                "ID": "85a43e14-a5b0-42c4-9b25-4d18b54660b4"
               },
               {
                 "CommandList": [
@@ -425,7 +426,7 @@
                     "ErrorCode": "0"
                   }
                 ],
-                "ID": "89b89d8e-bba6-47c0-a38b-bfadbc331c0f"
+                "ID": "98e23878-b7d8-47b8-81be-2d050c09d0ff"
               }
             ]
           }
@@ -467,6 +468,7 @@
           }
         ],
         "type": "textarea",
+        "placeholder": "请输入...",
         "resize": "vertical"
       },
       "DataValidationInfo": {}
@@ -530,7 +532,7 @@
                     }
                   }
                 ],
-                "ID": "303a6156-f755-4371-8ace-0634ab7557e7"
+                "ID": "47ccb8b0-3cf2-4aa1-b033-66ca69c3e19c"
               },
               {
                 "CommandList": [
@@ -545,7 +547,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "37979802-5d42-4ef6-9e22-5b6a2d00894b"
+                "ID": "05620e08-f825-455c-8a11-3e33e313a081"
               }
             ]
           }
@@ -616,7 +618,7 @@
                             ]
                           }
                         ],
-                        "ID": "696e75de-fadc-46d8-a712-8360ab6c2d07"
+                        "ID": "88c813a6-b36a-49a3-b200-1be3bb7aeb4e"
                       },
                       {
                         "CommandList": [
@@ -626,7 +628,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "db75207e-dab9-4a04-8c7a-fbaa6a931bc0"
+                        "ID": "facb130c-be51-4dfc-b195-4ae7ffe4657e"
                       }
                     ]
                   },
@@ -648,7 +650,7 @@
                     "Message": "操作成功"
                   }
                 ],
-                "ID": "c63dc4be-71ac-4a4f-9b36-d564b3d5fba8"
+                "ID": "a56e68c2-1494-4c33-b4da-acae410ac762"
               },
               {
                 "CommandList": [
@@ -658,7 +660,7 @@
                     "Message": "请指定项目"
                   }
                 ],
-                "ID": "a9ddcbe1-1ed7-48b3-888a-863cc1df34af"
+                "ID": "9432f20d-e1a2-4ad4-9c5c-99332a42ed5d"
               }
             ]
           }
@@ -968,4 +970,4 @@
       "Formula": "项目岗位配置!$B$4"
     }
   ]
-}//4tqFWXeZvYMRZtfaZUsHuc5LViQceZczpibYW5zNLb6LhW/GOegcvaVj64lIHf+XckJO06NZTpysa4JfB0nr7i3Yn8KZWsCJZeWEc+ZJk7ITnfF03nFQcNrG6ZcM/f76v5xxMt9knf//ZAK2XeJHLr4u5B2G0e8RXeKBitwBYii5acaAD7zaeFuvxTO5mxSj8TsqMEkCVKHXdCWFvM5LlHHb76feeNNVpcRUWy0QgDijjuXLIDmw8MwYXVV0vR3LORGK/x2bAZ9pyUd0iDekSiOkS3zSP+YfdSnR0Oj3XDDQG2cYbZznDGd/S81KDh+Az6OXhxzUfdZfDkpIUfNXXI8sKiBfGvlR6PNDjDCTAhbbRftAZd193Ar2PI8DN95ajA3/hl8s1CTpUpPB7t0KRlukjf6htnzvKpBI2gLCwf4OX0uRWsWbSRH+G03OMsTN5brkJDnCz2g4RePN9YzkyDKNElhzSB0EtQXsTWOxWYTeozmgDABPQQGWfmoCO/AknMaZz1Gs9FL9VRvlJcLjVM+TGC6Qv29std8zj6A256RW7b+KpB0jwZ+iQZgYwRh0CvvbmnANtWfnNKOW/o6JIOH83vioI9zdO2PkzkrzWFplTSJO3Ea+aZtCeCC6q0rGNy6Gw3YPyTSiJKU/olT4MVxkxNqm9AdgjRECf+9xW5ho9DfSSnmbVrOzGBFZwgttNiC66EbVvFnMs7J2NrYCV3RFpzPUYoPR4nsfkPUgOQBahR3l/VkOVTEhaPjLmdl7sUrHzNqNzRbqQEnaXYOn4F9GAO9SzZLjqwi88pAO40ghIw+U+jjci276ec6xQcfK4vSt/y6A0Wn0nJdVILNTALmMtrsp57kqrc1TKu5nZiWdlUfBNiFhfOu65Np8Qw9YMxAWciU5arIWPqhilZ/NQg==|920
+}///Yd3NhIJFnBf2wLe1fe5m91OtPtRmie+RtIcfmOTZ0DJOKqg4XDvT40p23bOKE1WqTJebvg2LwwIOM7DMx6EV8YPMosHldQb8ms6ZXmnZdnMSGzUgoTNn+4ltdmMgyYivBnfxViU/W01X83QTFbPo7hAtfsKwQ1CfNHwjDuXVwIi9+UjOzDQbuqI8fYDZMaeraAfl1b2ACNaHkWAum68e6yIeAZSWJxTCeGvTFna4KFHY6q2DZGoxAvdmixopxlPtWpYGHDJcF2nfS9XQTr3Mm35VifEfxcKTyODh/rKAQJKoaE6TMU5sxkrMTzGGbiKnZWdO/YCK54rgQ5aMMmQRfb/Mu1Br+s0YE0XePjMAROmxv6esfIy+I9qDZMfJpMChLQ1jAJUvgi/f1W+7wjYn8RXuEHArTA8R/MsylbA41bTExLT7CNZn++49NqED6ZeZyM5lu7l5wrhMi0sCV4iDcPSsgBJ5vagdGYHoqd6BJbZfhDTPLuqLb/LcGfdZX5ibX6+546RMmADGjIzeFoRBibT1oDVJhJ1UnJryjKpGLIXfKJjLzykW3F++FtaoDLirlyPqGws5MvFEDhoi8RVYoOPjtUNscmVf4wVN3TAyxIrhDHlsS67M16OWQb/BE696ENQxcSCZTAvBj5FjbVpVp4IWqFiucSNbvP06Eh0+2LAYvCmUa9+zKh4wvqZSWupS4zp/SCvFjyw8VFFWLUsG6UcI0zx9mKQzjX/kExPPPrAtYfHxy5BD71AL1IMNHBTwT21stdU9Zw0ystJXXaL42jZ286vnptFPGxYKTKmGbG6Vy7rgI6/26kO9sYlO+EVxBCHdhclfdJ5qhcYpnGj/jbOyOC6EWZcSZLc1VinsnfDRAZwZncdoBcDFNyX0w5acbZgLfcVig0BiZaKDZgHuA==|920

Pages/项目/项目首页/项目首页-容器页面/任务列表.json

@@ -64,13 +64,17 @@
           "DesignLengthInPixel": 15.0
         }
       },
-      "11": {
+      "12": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 37.0,
+          "IsHidden": true
         }
       }
     },
-    "Count": 12,
+    "InLogicalVisibleIndexes": [
+      12
+    ],
+    "Count": 13,
     "DefaultSize": 15.0
   },
   "Cols": {
@@ -481,7 +485,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "1c95b409-14a3-4be9-9e3e-ae377a5c7d4d"
+                "ID": "c604da30-cb73-4934-8544-26b41d9f59de"
               },
               {
                 "Condition": {
@@ -515,7 +519,7 @@
                     ]
                   }
                 ],
-                "ID": "55b45450-b607-43f8-aa52-47c66c174737"
+                "ID": "c9e4aef0-06ea-467b-9434-6d70ee1189d8"
               },
               {
                 "CommandList": [
@@ -568,7 +572,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "364d770b-2c63-4ffa-bc33-c0ef64e1a33f"
+                              "ID": "3f38e4d3-4aed-4402-b817-156caf6699c8"
                             }
                           ]
                         }
@@ -592,7 +596,7 @@
                     ]
                   }
                 ],
-                "ID": "1c222a5f-db60-447a-a98e-6494800f9928"
+                "ID": "8fe7e679-514e-4029-90d9-dc6389b8c7fa"
               }
             ]
           }
@@ -630,6 +634,32 @@
       "CellType": {
         "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
         "TemplatePageName": "a3c94948c8a24e6a9d63fc05ebfd71f",
+        "Command": {
+          "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+          "Commands": [
+            {
+              "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+              "PropertyItemsList": [
+                {
+                  "TargetCells": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=任务列表!当前分组"
+                  },
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=任务列表!ID"
+                  }
+                }
+              ]
+            }
+          ],
+          "ParamProperties": {
+            "ID": "ID",
+            "图标": "图标",
+            "分组名称": "分组名称",
+            "任务数量": "任务数量"
+          }
+        },
         "DataSourceType": 1,
         "DataSource": {
           "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
@@ -701,6 +731,7 @@
         },
         "DataSourceListviewName": "图文列表表格1",
         "TemplateKey": "悬浮变灰",
+        "AllowAddNewRow": true,
         "CommitDataWithCommand": true
       }
     },
@@ -756,7 +787,7 @@
           "TableName": "任务平行视图",
           "BindingInfos": [
             {
-              "GUID": "221e202a-cf7e-4ba2-a87b-ca7e4b8eefce",
+              "GUID": "04c39ea6-e635-4a01-8cf1-94e48441ad95",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "ID",
@@ -765,7 +796,7 @@
               "ColumnName": "value"
             },
             {
-              "GUID": "fff0a273-15bf-484a-b684-193cba4906c3",
+              "GUID": "0db56cc2-2664-4258-9966-d4259380fe21",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "父任务ID",
@@ -774,7 +805,7 @@
               "ColumnName": "parentValue"
             },
             {
-              "GUID": "d59a1f62-22e8-4e9c-beb3-72f4bc0159af",
+              "GUID": "d9f94e69-c99a-4db5-9396-93a3ecc5e0eb",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "任务状态",
@@ -788,7 +819,7 @@
               "ColumnName": "状态"
             },
             {
-              "GUID": "7dd361a9-1b2c-489c-a46c-ab598d21dd05",
+              "GUID": "db3bb0ac-b3cd-4b95-8cab-37b4d3f6216e",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "任务名称",
@@ -797,7 +828,7 @@
               "ColumnName": "任务名称"
             },
             {
-              "GUID": "29b244b6-aa98-4ca7-a310-aa4b2c449443",
+              "GUID": "869c5cbc-57bb-44dd-a79b-4bf78876a265",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "任务负责人",
@@ -810,7 +841,7 @@
               "ColumnName": "执行者"
             },
             {
-              "GUID": "a361bb62-9804-4389-8104-8a66bfab8bdf",
+              "GUID": "3fe90cbb-38cb-4119-b4f9-a92bb0eea2e7",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "开始时间",
@@ -819,7 +850,7 @@
               "ColumnName": "开始时间"
             },
             {
-              "GUID": "8d6431cb-2392-4738-897c-ba349213b950",
+              "GUID": "f440ca91-027d-4f04-a9fe-f4a0ee7b3937",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "结束时间",
@@ -828,7 +859,7 @@
               "ColumnName": "结束时间"
             },
             {
-              "GUID": "4ea5bd32-ecee-4d6a-87a6-e1a286b34d37",
+              "GUID": "6b01a452-87ff-46d4-bb33-e5912572d242",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "总计划工时",
@@ -837,7 +868,7 @@
               "ColumnName": "总计划工时"
             },
             {
-              "GUID": "20962eb9-f3c6-4069-a49b-2916c75c58e0",
+              "GUID": "211c7a20-bdd7-413c-80cb-bcd91590ac31",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "总实际工时",
@@ -846,7 +877,7 @@
               "ColumnName": "总实际工时"
             },
             {
-              "GUID": "d0338059-8b35-4e36-882b-6885580ced43",
+              "GUID": "ec6c0bb7-cf94-4e85-aba7-bbcb0b2c07cb",
               "BindingInfo": {
                 "TableName": "任务平行视图",
                 "ColumnName": "成员数量",
@@ -906,6 +937,18 @@
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                   "SerializeProperty": "=任务列表!AA2"
                 }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "任务平行视图",
+                  "ColumnName": "分组ID",
+                  "GUID": "17e883b4-67c9-4596-b6ca-697e53911a5c"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=任务列表!当前分组"
+                }
               }
             ]
           },
@@ -1083,7 +1126,7 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "60cdf47d-a868-43bc-939c-c6945291ecd1"
+                        "ID": "a1f3c87f-0939-4025-873d-db34789413c0"
                       },
                       {
                         "CommandList": [
@@ -1122,12 +1165,12 @@
                                     "LoadBindingDataOption": 1
                                   }
                                 ],
-                                "ID": "187e8910-d123-4231-8794-25ba08922ff2"
+                                "ID": "ff756337-3fd1-4951-aa30-c949db64ac51"
                               }
                             ]
                           }
                         ],
-                        "ID": "3d871a90-7bcb-467c-aa16-7eaf4f2feabd"
+                        "ID": "beb6e3d9-1402-42d0-a52d-408233206293"
                       }
                     ]
                   }
@@ -1339,7 +1382,44 @@
       "10,36": 2,
       "10,37": 2,
       "10,38": 2,
-      "11,7": 0
+      "11,1": 4,
+      "11,2": 4,
+      "11,3": 4,
+      "11,4": 4,
+      "11,5": 4,
+      "11,6": 4,
+      "11,7": 0,
+      "11,9": 2,
+      "11,10": 2,
+      "11,11": 2,
+      "11,12": 2,
+      "11,13": 2,
+      "11,14": 2,
+      "11,15": 2,
+      "11,16": 2,
+      "11,17": 2,
+      "11,18": 2,
+      "11,19": 2,
+      "11,20": 2,
+      "11,21": 2,
+      "11,22": 2,
+      "11,23": 2,
+      "11,24": 2,
+      "11,25": 2,
+      "11,26": 2,
+      "11,27": 2,
+      "11,28": 2,
+      "11,29": 2,
+      "11,30": 2,
+      "11,31": 2,
+      "11,32": 2,
+      "11,33": 2,
+      "11,34": 2,
+      "11,35": 2,
+      "11,36": 2,
+      "11,37": 2,
+      "11,38": 2,
+      "12,7": 0
     },
     "SheetStyle": {
       "FontFamily": 1
@@ -1355,7 +1435,8 @@
     "1,26,1,7",
     "1,34,1,3",
     "1,9,1,8",
-    "5,10,5,28"
+    "5,10,5,28",
+    "12,1,1,5"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1394,7 +1475,8 @@
       ]
     },
     "RowBreakLines": [],
-    "RepeatRangeSettings": []
+    "RepeatRangeSettings": [],
+    "RelatedDataTableName": "项目任务分组"
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -1411,7 +1493,7 @@
       },
       "IsAutomaticFill": false,
       "Location": "0,15",
-      "Size": "1196,336"
+      "Size": "1196,378"
     },
     {
       "FitToBrowserHeight": true,
@@ -1421,7 +1503,7 @@
         "Fill": "Background 1 0"
       },
       "IsAutomaticFill": false,
-      "Size": "222,351"
+      "Size": "222,393"
     },
     {
       "Name": "6a8619c3-eb2f-4fd6-82da-9e421969cd18.png",
@@ -1453,6 +1535,10 @@
     {
       "Name": "任务分组区域",
       "Formula": "任务列表!$B$4"
+    },
+    {
+      "Name": "当前分组",
+      "Formula": "任务列表!$B$13"
     }
   ]
-}//3g8rU0S3y+SQJarYrLnvsvck8UwB50o2cVSOJR5jvrzgJ8OdyxL44aoiGHjTOhqBh0TduA7g1g5NusU3MCvoqxQS0Nb/KLITqCQQr9SPz1q4nazihQ0fF3R2DcmFCEqDgLwJ1SOIGlGrTs56oGz89iUxYdrFOG2VieX0leTVmGEsYf/BnwQ50+OJwDXnArHPGBA+ky6yJBYnEHwpke8uO7XEa234H1/4nn+LONUING3bO+P5OLR7g/ZnZKvwaVJVyKIE3plfSz8ZfJ56ao/dNxOA/5fJKV+nc/7n5kF8c7Twy9c+e7vaDQlC7yVCLoAj1gaYLOWlKTtviU4imkcPj+k4RjWAil/cj4fH4NFwvOnO3z1bAkl5hp43stjbiC+3azBofzRcWuefkHXOydhzXuNFqaPbF0Nw5d1fbs6ltacqIDZABwnmp8GexQt0YSS8JDsw4B/dUCF3n6GVa4xBVCoWPPXNOHKR1g/w79tK9sj8vw7TMOvS9MDErGbVUkqnqjPPMimKsfOUq2rpUJZ0Z81k9vLfAuTy/ByvDWtRJDw19hSIMoLBvK94NaAOT+f2QWMq4hJR+yxBm0KI5lO286OG00o7V7TYXXfNV5MvnnlhqCWNGeLA3QqgcrhYnEOhprC4xYR0WBg7BOIZ9AJMjTU/OtFNWmX8YUbJ4XXlHztd4FQQjc8cA+HcwPUgUhzbemawFQwwzn/T108BvqjlEP8wUictAHiBgRtH62NIi+nz7D2ykgqPowzPxs57l8kFNX8QfUYwgozQ280Ze8Z43nwi1p35Lgn2oIpwAGl7VBY2I24zo+0vFhof21UTHT+n18xIv9qKMN0qRjI7KXhsD236Q053NzX5I6E5ZJGHLKRXgkSM5mGLcXNLA/ggGSRXuiynLvcq1Te318cgh5QxkA==|920
+}//wVhsMK09ZUHunBdJuYkxMPn3a1RVyzQFNcD3JaEJ2VRkyb4Y7Z5/TCLQY3jkSI052zg1OigIDLe8vdla8POqpAOdKfGVXjD/Zb7YnGfvH5d4zMJODyuxXbEqQSjEt/BYkk98/IOqB/lTXyakfVVFA6N6FBm/nuRN+o0in4WxTXkQksC6eFe53uuHimKFqw7XFBV8C/oE8EjairMzt8qE+LQhmfFY7Q4xGoadfklH0wtLgTbW8hC2Y5WIRc+rL53rCSLu7QxMFf/C1BQSs3pWxwAhjmQWKpNmCb7O1OmxuJOyPHKctZsZKq+TUxrRjzDW+rt15aNQ05o5iOt/RLEMHflrEmhlTwB11NpqjSNbfTMzr3h9nlwhLoaPW7d4Q3X6fRU3zBDV6pajcbOnGR88ahR0KvQPv4O6s1J01wzpn7TdKfBjnqjhWEOmgEOrfUEegsd7kE12oxgof4egphtsH7DZKDY6dIM6dTHrejRfovMALiv8pVuPXq5BOpOt5+pOv+nhX+3xsaEnFiSB+NqU+Hq6SwkP4Hx7sfeUQDqMmTjDMHysG99qTV7oiNoK/VceUI2msJW/AhgxDhP+qqlZXeBkQHhj2VmWdSlT18VwjLZLRuSZUngRh6xYox8gO4fXrdsY8mFYbQ1qc1O9sfwcvmJ3wZ8FPyV1BtpgeFCU4ujHQUJ2+H/dZFq7IcC6pZPIZYWOXlINEQxdkKZndr+eTb4ScWbUrnQjx3c0HpGlLnQdy7UZ7pdb2FdUKYXbW6aPxypM5JjWmksnH9VJmNucc0UY/2TpLVs0zVje4qie91cBkdrtCLbXndlloQDVO064IRqnS0847obGAcituBxxOdho+q6WcuGe+zlWbbCpNe6GKBoeKD2NVPSfL0m4Z1YFgsw721fLQGPWvd714XwOZg==|920

Pages/项目/项目首页/项目首页-容器页面/任务列表.rd

@@ -1,11 +1,15 @@
 {
   "PageType": 0,
   "ColumnCount": 40,
-  "RowCount": 12,
+  "RowCount": 13,
   "CustomNames": [
     {
       "Name": "任务分组区域",
       "Formula": "任务列表!$B$4"
+    },
+    {
+      "Name": "当前分组",
+      "Formula": "任务列表!$B$13"
     }
   ]
 }

Pages/项目/项目首页/项目首页-容器页面/项目代码.json

@@ -320,15 +320,15 @@
           "DesignLengthInPixel": 16.0
         }
       },
-      "43": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
       "42": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 298.0
         }
+      },
+      "43": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
       }
     },
     "Count": 44,
@@ -421,6 +421,7 @@
     "1,5": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
         "UIPermissions": [
           {
             "Scope": 2,
@@ -633,6 +634,14 @@
               },
               "ColumnName": "空间和仓库名"
             },
+            {
+              "GUID": "b0e59c53-50f0-4c05-b130-b126318af202",
+              "Formula": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=IF(项目代码!仓库ID=\"\",\"未绑定仓库\",项目代码!空间和仓库名)"
+              },
+              "ColumnName": "副标题"
+            },
             {
               "GUID": "713887b8-3999-4945-9ac5-2ce140aa3df2",
               "BindingInfo": {
@@ -1518,4 +1527,4 @@
       "Formula": "项目代码!$B$28"
     }
   ]
-}//uMuUJL/yioAYfUrJXaNzOkBIXHPqCyxf/glQb+8pMCXvND/TFOUGAwiB/ZsUjE+QFtwEnJAIUu4f+QrZpZOcboCUMsAova658UhPhgYfdJhurHlVK0/+g2/izjYVPAiQl4SZ2PM0C6y7MVrqz2id+HVe3i9mEp7E39S2HXxc4Ua/NUmjOtqvxppK+f5is6VJ9hsdzFgGX+YC8wMnjMH+PF2XHvAAbq7T5+iiPsm4nvFBDJLVijhvQyZ2Q1+9Ysq2ps/fl6sb3rSKyzVhBcUtYK/a85olq0WB73j/RtpcX1Axj7ndokCqwEQRlFYtYmF5B7AC3O7uUDHz/M+Udqse61Gybg7X7wf0BP/VsP3pMpJ2xVGWvEQ/QafhhczmolvpZoncggcHWsdAyYcaIvOHop7JuVYerXpqe5oz6LdnwPXA0MhwXre63qSCL0oDOWR3qfy+w9Bw1nMRMoEfAfUej/jNRQ9b/InrhZ66XJW5Uj+qTPwOqJqtoxB5JhmUP7dUUagE6ppHfAEXi6Ax6h8m5NxZFDggerwj8JFc9xOdaFJ71xiypyGndaE14KG6gCv1B7HZGnHtHQ7/Nu8nzJ/aeF035nDqsqO6++G2hYRYnAQMncDYlEaOkV7BRCl16b75tSiT8ioSrIQmF9X3XE6J2lYbnRskOn5OKIc1u7ja1UHPMFOS+MRRrVTIermHN3nng7zAmDX2P4eYOcGnHxAWGONliDzLxmvBeI/4IGXi/K7V/ymsyvqwAF9KDlsMWRAvBAW+g9lXpYNY2la57kVHAgBI+VY2YjxckdLZx3xkTp16ea7Ut74tKX8VbkzR1erahTs0Mls3fHC5r0ke0tPJJNsmFMMLwGkatJXFCLJkSZ3tPXoRBIUVplGbaTFDDwbb16CVTkCiaQQIvTDUAMGMMA==|920
+}//mnvjNYQiLABdzeK1Ni3BpyjBtQn0ycywpUNCeXekXyTQhtgDroi7C0j+gbR0StS9bxrWxhUA8CsX4EL6PLoN1HTHE8dHXxvEZPRG/FUdw+m4FgJtfkyOq+PywXS1j2tTqzvGTS4ecBiTUSy3bVdqSlg4V1DaNfRlRHd7BWoXgpbGs9yqj5AA57HQ6tiSwZrwDdLsY4tmrK0k6VnQhPDpI3b8CqkJogmzpx/9rD3JoMyrbWBLonhqJSGX3cDTx6j1pCNT2kdD/Ub1VJNEwFnZEywDaL6x3QvbEN1VuQZn5SloxISCZFLlqsF2wg5wA5YDQe49KyfLKqCY8xhVEevx/RsBhgS03f4S+sguvjUrBGC5c7LSrQrDEeqSbHufnvHflEELHP9GIxwJTM4E0H7QSvzHCYCkgHg17Js6VF6vnBmA1hBIexfKb4SfMHLejv5L2Qdhrhd/FBMnBtoqOM9hWLTyQ+sJISx/KS7ZxRNUGv71FMkVytKblGacubvYGIBpTPZCaZR69dkTTOeUSvtKg6i5qAfslN5CAt3QKfZYouZLiONzYTVzsRi/uaf1TjyH0qHrCuT4gVBNuuXvp4N7/OsNaCfC1YnXZa7KXjsN9M4eOTuNYEpjesAOzC7jEUTujfok/7kCICVDwEmIl4Cf/bkj32TxZKf0NiwjQB0BBnMmjliW7EzEv4CaMlVdxG7DwKz3465qWJmJrHCBYNAQDu0RWR7r+MI7+N+jL56twhozXE+9yp/JdERFc6bV+x3DKz203WsQG4hp5qfA3+SqLvgcz6NE9fhoAVZWXg9uJLCynxG/0JxfyR7gjPdG4DKj6i5WCMbf3itDBI9EtKkqQT0BeLph6NkNGfGxBCSvCW+smmsy7mDv5JbHd9m4zH0kk/IlayX+wIfDkzRBZKnKiw==|920