{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/分配计划工时"},{"State":1,"Type":1,"Name":"PCPage/汇报详情"},{"State":1,"Type":15,"Name":"ServerCommand/AI内容转报工数据"},{"State":1,"Type":15,"Name":"ServerCommand/AI报工数据转日报"}],"Version":"v1"}

2024-04-24 16:26:10 +08:00
parent b99abb29aa
commit 79dcf1c019
10 changed files with 249 additions and 395 deletions
--- a/Pages/484d3ed119274a60bf32f15d178cf60.json
+++ b/Pages/484d3ed119274a60bf32f15d178cf60.json
@@ -227,7 +227,7 @@
                    "ShowConfirm": false
                  }
                ],
-                "ID": "2021be82-0ca6-4fd6-837a-5bf82943db43"
+                "ID": "903ac92b-c3f5-47be-9c26-cbc0f055c143"
              }
            ]
          }
@@ -759,7 +759,7 @@
                    "ShowConfirm": false
                  }
                ],
-                "ID": "a72b0750-1496-48f8-be6c-ed5587edddc0"
+                "ID": "1061923e-dd2b-4241-9cbf-fe73f62496d0"
              }
            ]
          }
@@ -846,7 +846,7 @@
                    "MethodName": "ExecuteCommand"
                  }
                ],
-                "ID": "a3551648-e601-4616-8ac6-353c3ce3ae5e"
+                "ID": "ce7800da-2919-4a3e-ae39-b9ec2dd0a9ff"
              },
              {
                "CommandList": [
@@ -860,7 +860,7 @@
                    "MethodName": "ExecuteCommand"
                  }
                ],
-                "ID": "39764aef-cb8a-4109-972f-6b876e1c6a4e"
+                "ID": "e0941564-3e75-48a5-b57c-4fe072dbe3c2"
              }
            ]
          }
@@ -1111,4 +1111,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//1Z5HJQfJoNzhpoeX57OrzBtOKHDa8nPKPmU1fQVi09/9J8Tm4ShYxeiwUSNAUbwY7WpV0+o4TPoZZ/po8UAIgPPHSe/mHoTvBZwN78sIfEn270m63c/njk+4pLt5gXCd8jYv3ixVIuB0OFIoQ8kFwVJXG9MiFKQhjOAOjd5bTA8A0+5EQCk99d0ccIhAC9E7Q8My/jrOCf0EC8VEtLAQdUgqApqPEzmiufonXDilO405rsuq4IcYdNFkghI02Y13YmqyXPZunS/DCvES55PdNF/+/gTPeKz9NLUPNKE+qifRIp06omNxpMZJWfgIgtsi5dMuk5eliPdiuJ/+PzbOFNI/zGFY8XXq9Klk9nwiKfTuVVV0SoNv6l172QoZnDp/xvTvqtQ6RczleFSuaowc+6WG2VftNcE5TrecAw5XLhVA01Kxs8FAoLyp66CO8ai7jE1rJmoVMj4/gQ6K1XButIUwXj6/GfomJ+jGl9rwKMAV9D8mbiimDVO4fLEf5Qodpjmg3TVDLbWqsiJ/g9/qK2uH3sasl3qzCAEx3NxkKS16wH/CjnHUarbUdhCakD9dAucPo2Micc7bh0OHOFjsxjpheOMsObor71bHK3GV3e6aXYgwExqROcjnWARrPPE13oL42poUDBGehuCaGSFwKccmeF9r881Jj1P+vN3ht0J/cJQcODr44o9XUhmTZxyvO5HQDQJlQEVMVcxg0kQXwKPwkcF4/4MojBNcNIk24NjD3HN3B2Q2pd6qMXc86HoUWfaoQ0lsfh8KesM6vazHniigPAXT8fqRBEZ7w27DooQv7U29X9jgKppdYDYWluxH0ialYLaOC4QnCb2rd41Sa/EV0WmoD6kJJryZLpMdMHCIXwQcGy5/3Pc4Ws3JKToHvpUSDPKFvJ6s7jeGh8aN7w==|920
+}//fwg4FQFX81sj3Hf1act/OOmZ8PO3xQvaG3jtB+VlDYOsukJT3sdeJwpDTIpqEatgVJc/mtgZENTzVWZSVXp+AMN8sggvvZsciOD2WwIZkLmB0pMRlgJT6lqTPL5Sro+oTz7EI5ATtFx7xGGaKuTJCAVUVH2zIfmfJUiZy9+/LTYC0Ic3PN5ZwG1MKQMbGb0tUOA57ujAidi0vQllMruHXJTZZbuzpb2vAM4rvvi+t6//j1qqZWUk5up99n61pL0KFrKzgTo6xwMw6HV7/83n9BCohWA+mVtV+sMuUzMuvS7c2kMafEGPqMEzbDO14Gdvi9CophdGo4h+Ctk7Mit5TPmbJROfNKetkHtLiUFj3X63/zhw9NHdZ/lO6SNyCiXl92BfSd9vt4QNwdzURwGo6veD+YBHSqEw94qSwOtQ1Nsj97P+xcfP2Y6wzu37pGvVjF9JbxVf4Udb/CMNwmP9bwquyBIfhw0g0BoTefExLGb1I2aGjDYKPXSbOeb1J6cPbAuFE5MGeIC2Icu3AySywRo32MJn0aZKWik/oI7+ynIsM+tNXE7FYej2SFFNONZyYQ2j7OB5h3mbGW+YwlS2W4qZVX1bBJ2cozkaUvydFdTVwJyilTx/COilLACP92x47HbsKZRxAkTrpH4G7iO1HOvjpeA+J0B3BOD6Kv276MWXXtGHGjgl5WXeizn6YMoIpmntH77tVClkcbI5Q+B/GvfCoPMGNC+5VeRofdCUCyzOgdQ6nZM+5VdzvJtcLfbEanIWuwFHx3P9gZ4NxxkkiFGpquYIxi9ulV9EBzze8+5J5n7ufOLVizywyWtYgNlo11x/A/aQq+cupVPOR74XUaZcvyV68P2iiDiRj/SN5HBVLd6oGjvl9AoZutUIymFt2Oey9mrYz5WF4pfAUPuBtA==|920
--- a/Pages/任务/工时/分配计划工时.json
+++ b/Pages/任务/工时/分配计划工时.json
@@ -1078,7 +1078,7 @@
                ]
              }
            ],
-            "ID": "0c7904a0-24f2-4419-90d9-4db83e642be8"
+            "ID": "4cf285d5-784c-49d7-ae75-876dcf01a256"
          },
          {
            "CommandList": [
@@ -1095,7 +1095,7 @@
                ]
              }
            ],
-            "ID": "dfcdca39-cc00-47b2-afa6-b3eff1aead95"
+            "ID": "07caff52-d4c1-4184-8163-c1c865c72ab5"
          }
        ],
        "Comments": "只有工时分配方式为【分配到天】的情况下，才需要填写日期，否则不需要"
@@ -1124,17 +1124,13 @@
    "Margin": {}
  },
  "CustomNames": [
-    {
-      "Name": "任务ID",
-      "Formula": "分配计划工时!$B$22"
-    },
-    {
-      "Name": "工时类型",
-      "Formula": "#REF!"
-    },
    {
      "Name": "参与人列表",
      "Formula": "分配计划工时!$G$22"
+    },
+    {
+      "Name": "任务ID",
+      "Formula": "分配计划工时!$B$22"
    }
  ]
-}//HJA9vhrkMBYRFyhlnjV9ZHJb68GPdTgIDfDSbycCSq0tHmIhkapsdDZIJdHByAZ7oSHe2iu2FIWmC2wZquG49HLX/zGXtwxRsj2f6+jb2/L6xHZT2hasGef/mQ8K6cPuJl7Uvhjaf8wwaO1nhCx23l/sf8kRgvIJWnvu4krgxOCXZW37ZXIE3yjlzxipCMojULr1iun8otGUTDJWCPNWlIQTL+0ORctkgPhn7bJLsE0yc6Q9w6c2Gm+ZgefvmrEWoweNnr3DnrmzecB1yDBpM3Caj4+NiM600IcoeKDLHnbItMzxCiqi4jMB3X8MOH7OPdFhPoFHVbv8qpw1fxy8lZxnc5rwEAzvQFe+ZwUfGC0eDlke2y3Kgnith0tRqFrt2MUtRoJrlo2W3BNwnEJfG0CezLInfbv3EbqKmct5Ics7SS6xyy4nlUZ/XZz5aKCY6QalM0Sr+KJK25zvj7xp21XUs4IoUr4mJ5gL8dWaKGVSh0Rg/5B2WaD3XW0EihSK5+gmgm0Rovzansr+VYDXHKSzS34FjD4H00DhdmaMi0Z42asfRu4PmeXmOnM9f92YnT4kyz6Uf5spJEiYnQP9bZSDcxCHC9VcUZ1p2IweUp04+++2Jhsqmj/SKDapSosEjtau/YJXirtzNhz6GXfe1wOAQfTFpf5844YvJJK+cfQnWh8hnTU7BQdAqENbMYHPO9loHlaJtT48XQMJWFI6BsxNRLWXQq0tIQ+S7UJbtMtelzWflVnl31X6pDgNfoYrJndsj8o2WFdc0jHdCWaVL4v1/bXDRU0NUuYkhzQwBTWUy/YyP2Ts/dLGmjDfhTUKVB7bvW/f5P9T8YEDQFXUrojxw3Cc19CYGfo5oAPUZ4LDzmMyl7EgKM6TBtqqXcoYgb46zjLBC7sZBNK2GxH0Cg==|920
+}//DNM20pKLTGwoiGD5YQyaAtwO5IuDXzV6u2+s30DVOkv1KDWVezHEAHGbXh2sMqsKnANcpOyDjulUbwNTU91qBCApgVuWU+/Wjqr0M8aU+9bZG7bVvlFEL5jLMzOK7TCaCHWF9jkI8pUAOseX4thF1zGlwV6Q8zLfyULLiPY5PatkHjh4FlDm7EO6UQqbY+Pu2q/2mTAOl87oNuH2xrtxWLYAXlY/H858wv0twMACJiARdvFe+ETwnMX946lYQMC7XIwCNRUKkFsen+A4x3XFPhz2AKbni9CvPEnLvg8XZW8wQMMGjqIi55eJ14f5e/4oxDicrXOZUf5TdxFWR45oBu3CbluUrg/kcdaa6+xXfRBxpTwL4SFu1kTN1CY2fOsry9grEVcTWMMhHCLVOysR+m2oYKS/P9A9J0UaaIOLcvH+t5w86VEO9B9NwVQ0nvVmP4u08B5Ea6n1IcHq9k/j3H/1n8wIaSj3qCmYxSfYlEm9NNlDCoZ1/YGx+WZJv5dExumokouWclD4wwGtAeK2H06VMXSLTUcFTpOuk9GHqaH1AeFXDVTHrP5VAKvjUALHULSTU7uG28tj9yKD/s9THDVtxoNDmtbwRsfKKsuRFbGq4Au6wIzTmhH/cxeRG/9kvU79ZNBreCA+QOnpOi6J8shR6mmcPjHUhVhhOpPTjVfLAOlmGnUjOTel6R1a1pHh5qvH6l0dDp5xp44fa9EXwgCARdxB0q/6Qypip0WbU2vWnUzfPBJJ2TIVKjhq80Fll6mg08m7rW/Ol7VzfwaeKo69x2NHHUS2/s9IMetqoCsqpyd2HubBnvs84pgiTTGqHZEva+AtGcpxfVa88kEOg5Fxp77gx01a1kZ+qTWScdFypmeTG4OBdxgUax6PNrw24Bsugmzj0QP4W37lK96ReA==|920
--- a/Pages/任务/工时/分配计划工时.rd
+++ b/Pages/任务/工时/分配计划工时.rd
@@ -6,17 +6,13 @@
    "7,1": "TODAY()&\",\"&TODAY()"
  },
  "CustomNames": [
-    {
-      "Name": "任务ID",
-      "Formula": "分配计划工时!$B$22"
-    },
-    {
-      "Name": "工时类型",
-      "Formula": "#REF!"
-    },
    {
      "Name": "参与人列表",
      "Formula": "分配计划工时!$G$22"
+    },
+    {
+      "Name": "任务ID",
+      "Formula": "分配计划工时!$B$22"
    }
  ]
 }
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -1446,7 +1446,7 @@
                ]
              }
            ],
-            "ID": "a6624d21-6646-4323-91cd-993961bc55db"
+            "ID": "adb67c77-9643-40ea-bf25-783ee5572f84"
          },
          {
            "CommandList": [
@@ -1463,7 +1463,7 @@
                ]
              }
            ],
-            "ID": "f4bd3296-97f6-4f11-babe-1378aad50b48"
+            "ID": "e870397a-291e-4720-b115-b08acb2d2c2c"
          }
        ]
      }
@@ -1491,13 +1491,9 @@
    "Margin": {}
  },
  "CustomNames": [
-    {
-      "Name": "工时类型",
-      "Formula": "#REF!"
-    },
    {
      "Name": "任务ID",
      "Formula": "新增报工!$B$27"
    }
  ]
-}//WikzRHpZdmC0nkqoE3FbUrTFc68rCWik+4001jc6q3N6wvGrzs8ZmQxVc5v4bgV1HjvVXaCkCA+7AZZHbmF3xTZZoknzxHMbjnTBOowb6DzF6UYR8WFoIA2poZdi/ZjEP7JhX4n7f2zZhxHxTuQkGVjTtcsfSzDla7BdPss0U8VpBbjEPCIvepgqQvjJ/EvXVd3TYv5ezrpvO8oOY3ROUpkdOWzToHvV2z4ERtw/5xOE5MY9kC0Kguvl7C0yApmB370IU77NYU0bkDBbir3+/cLiquNr6D/l14By0PdnL+IekvbJnDqhGM3B/IqFojUYull0vLCs9piPFSTelRsdIp/0ZE9iEn2AEjgpXpfL9aVXmrbfA7cP1typEonDOf8b7AcAN4reacKswVy+/0Di8m9IIF/8SlD0iDJe6qJKBjxNmzwDd+/qNgdPAruiVL6wvLty0XY8cP+vvHoTSSdWPhOHGJhrNAQAI6M+2ILQnI1F9PQWZRq437EMZeJ7H7uj8lo2zN4fwnmid7mpeNFEfVv4YmxZkbXF+FH+lPQM4XTCIa3e1a3mZXHFGsR/GcH95iqtfLuQVuZcer7H52arl77T2fvDx67ouCe1bu9lvoJx6ZW0454yeLMLa4+VtQDjV/r86e0oekG5aPHIWdCcQkzUIVh58Hnmv8t3i5621M0eHMtdHBqeAk4j4m6wIrKZoRPEpKHkRsawbTS0nYplW5xcCafNQtzGox72TMKSkybX956pp6cfboXMevP28bnlunV2jaMzseNxvemkVqLFbPMlTLFQl1UG0IKgtNqvHCjleQQAdR0Atlu5WfmhO2FBjP8XfC+F5qHv8GTi8AXx3wnY4YsU/tZY+nbiwlyjXeCTTj5bjK5ncPGPzVarprBb4u7E8MKDxigfxWUaiYgcAQ==|920
+}//humjkBwFCjmCtIBWk+xAXI91xbfuk68Ds+NhTGH/1JwMrgGRgQivoef/n7RbtAYtdMU1HB2InfH8etGx2uJgAznBCWLJ5o9xq52qJU2bFiWZDVk1KYWMFkYYNAwY75id6mWC9l657G2RkaRLhB1cJlDTTAU9DaRbjiuIHwGvViD5wOwIpHBjpBVCsPmOGsSqHOBlsLjnKPCQbqaagsTk/ScGQUZnmQrYKa/D/os9130zWJq8lp9s/Z21Vni679bksieLGy/D7IaPZieFWQVnYR+VGhFqVM2rE8OxmPQ3f1oNx8X6S5Gos1xuiJ6NWR2eitepXpc3bpnrshtNo4NtntaECUK+62wPhC7uA4/t/NzgnzPOTdAT/uYdhkahfHvOeV2F9K4/gj7Is2JTAp+rdcouS9HU5YHGKFhZ2IAgbgGujk9JPU0xUV/5QF9jsqlTHORroTZ/Xz3+XyXwykv0YPNYLzmQ+zXf8E+6ke3Nmc54tsKxY/OZ+12/PpqQBVYF6kZSRixtd/qdiKWbMbypiW4gVOL/JXDQtLgD3DSermBJPRaxGRqswjsD67RCLv4+QqvCSc8LuqhLuRf4W3vHzPJCxK1YRjwW/0hVw0EvCikfoWnc8I63vTpmE0ePq1jjmyTdLh5lQ+P/migalQKgiILWZ/dahlZXB5UAJIGWmtvO50O1WHn19Qk6gGLmbscAURgdW9rcg2igME4aAe3DL2/dxfzFZqgOgq76EpqbVeFav/E9M9Dl8gcdFPzGwTT6cZu87LtQwKL9sZRm93EQ0f8xoUr3ZURtVUwhCTFEgZkhyQb8HYMpGwxuCD+E0tJvsw2ULBOjIf6E6T1b+gBf6NsyMnKJN5R9FzrDRTppCsKJCascZqcLMUPPdZKNuBkOXb/JO53pfRaVjcmtVv5XSg==|920
--- a/Pages/任务/工时/新增报工.rd
+++ b/Pages/任务/工时/新增报工.rd
@@ -7,10 +7,6 @@
    "26,6": "DATEDIF(G27,K27,\"d\")+1"
  },
  "CustomNames": [
-    {
-      "Name": "工时类型",
-      "Formula": "#REF!"
-    },
    {
      "Name": "任务ID",
      "Formula": "新增报工!$B$27"
--- a/Pages/汇报/汇报详情.json
+++ b/Pages/汇报/汇报详情.json
@@ -271,7 +271,8 @@
    "10,44": "保存",
    "12,7": "新增一行",
    "12,13": "%CurrentUser.UserName%",
-    "12,16": "%CurrentUser.FullName%"
+    "12,16": "%CurrentUser.FullName%",
+    "12,19": "%CurrentUser.UserName%"
  },
  "Formulas": {
    "10,44": "IF(汇报ID>0,\"更新\",\"提交\")"
@@ -392,7 +393,7 @@
                        "ParamName": "汇报人",
                        "Value": {
                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=汇报详情!汇报ID"
+                          "SerializeProperty": "=汇报详情!用户名"
                        }
                      },
                      {
@@ -495,7 +496,7 @@
                            ]
                          }
                        ],
-                        "ID": "45e1c075-7e6a-4566-ac12-3795b9869bc8"
+                        "ID": "0647f4a5-10dd-42e3-aff5-1f73d5b7a69c"
                      },
                      {
                        "CommandList": [
@@ -510,12 +511,12 @@
                            "BtnText": "知道了"
                          }
                        ],
-                        "ID": "c8ec2b09-8ef9-49a5-84c9-b7a5d6e4eefb"
+                        "ID": "d50b3314-e9dc-4ba5-beff-6588c290bf7c"
                      }
                    ]
                  }
                ],
-                "ID": "b02f35a1-4480-4543-b2a5-54e45099a1e6"
+                "ID": "1ac585cf-5b78-4f56-bb45-6690842529e4"
              },
              {
                "CommandList": [
@@ -525,7 +526,7 @@
                    "Message": "请选择汇报日期"
                  }
                ],
-                "ID": "a5daa381-34f6-4623-b793-dbd270593172"
+                "ID": "43f115e4-1c2f-4ad5-bf73-9e01d7c37743"
              }
            ]
          }
@@ -657,7 +658,7 @@
                            }
                          }
                        ],
-                        "ID": "7b6a8bc1-3e2e-4a2e-98d1-a027679fd888"
+                        "ID": "7a8064fc-a766-4275-a768-b74d119f3841"
                      },
                      {
                        "CommandList": [
@@ -672,12 +673,12 @@
                            "BtnText": "知道了"
                          }
                        ],
-                        "ID": "e898ca70-8153-4116-838b-a7e555a718a0"
+                        "ID": "6f880c73-6452-4d05-aa23-28b48836303f"
                      }
                    ]
                  }
                ],
-                "ID": "f7bb29d5-efea-4f0d-a441-bb68c0e19746"
+                "ID": "3acbcfd6-dbb3-45a2-ba9a-1b80a9c3b4d1"
              },
              {
                "CommandList": [
@@ -687,7 +688,7 @@
                    "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！"
                  }
                ],
-                "ID": "8e7de297-3a41-410f-819e-767c385ff5a2"
+                "ID": "d1d8efb3-0ef4-4ecc-a49d-2f3c2d216f32"
              }
            ]
          }
@@ -1020,7 +1021,7 @@
                    "ReloadData": true
                  }
                ],
-                "ID": "c3ec838d-8cb0-4007-beb5-81948e4872e0"
+                "ID": "2923a923-1fee-4d92-89a9-9306fc981aab"
              },
              {
                "CommandList": [
@@ -1035,7 +1036,7 @@
                    "BtnText": "知道了"
                  }
                ],
-                "ID": "410265d8-8641-4d36-aa13-c2a57c589156"
+                "ID": "f05e4e26-c3e9-42a3-90bd-59ff5e1d5c5e"
              }
            ]
          }
@@ -1359,8 +1360,8 @@
    "10,44,1,4",
    "10,40,1,3",
    "4,24,4,25",
-    "12,19,1,4",
-    "5,6,1,16"
+    "5,6,1,16",
+    "12,19,1,4"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1388,20 +1389,28 @@
  },
  "CustomNames": [
    {
-      "Name": "增加一行按钮",
-      "Formula": "汇报详情!$H$13"
+      "Name": "汇报日期",
+      "Formula": "汇报详情!$H$2"
    },
    {
      "Name": "汇报ID",
      "Formula": "汇报详情!$D$13"
    },
-    {
-      "Name": "汇报日期",
-      "Formula": "汇报详情!$H$2"
-    },
    {
      "Name": "用户全名",
      "Formula": "汇报详情!$Q$13"
+    },
+    {
+      "Name": "增加一行按钮",
+      "Formula": "汇报详情!$H$13"
+    },
+    {
+      "Name": "汇报人",
+      "Formula": "汇报详情!$N$13"
+    },
+    {
+      "Name": "用户名",
+      "Formula": "汇报详情!$T$13"
    }
  ]
-}//bmYDNVy7tl0daXxrKTZz6310cE5OHsFvhh6vLYv6lhVNXl7xgYQk4oN2ggOQS6vJpf5iv6YNISMFY5cJMpXhs2NFFsHyYK8FUciBC5L4JdKq5dl8fiDUJdvuR70D9XIeratTTRfdHcD9TX1segjGUTErBdoGx9JtXnIWNBAkbfxpzkfLVqEXhvQYu14GDZ339nnOQHrWD5xQNYf7TE5+TV7GYen/46/uomCs1juZhMif1TV6vVUu+mJidBaovlPzqPeaGaGm/vCz7oFJNYsVaKv9UF0t1VlB9o4QjHlZh/k3gpNCXhcO3thw10k5zRRBkdk99dQdHPq7awyUDB9A1jhF3idWjuhzCGl72KNV4BLG2eklsrf6T/2+iX9FbLWLBVLGseTCh//IBq5ufbuVjn1rIA7hA/wzT29ZNgm9RU6g0RchdLngWw1vTv8xAzFnulKQjSgT5pFso1BgTAUVmJ4uLjblhlEUBsLzjEXwnjf4Pqjx1OT/LjrOxxEz5My+Nlq69MKgQc5jSgMvTBeNW4k+3A874fNMcJBQ2AQ2pPnjcUxhjNH7gCVrcXca9fbC89/O7YA0uSUV9vANoATelGSYJ+nRqbaT4IGqOp3anZOaZZEtcyVAKBtnITpxFKynrmFyj/s8xd9vYqfGAFXJQolRF9P+1N2zBX4iGlGMXDrJYskTQnGq2maXrRN/um044uY4Ks+67Q9abroxFbXducoo8qSJmXehM8+Zpspt6Y9JltC1LhQgXRI4zGzePJjH3W8qBBe5X/OiEhotIv8qcbmCqyJZzySq8Bm3XC+AIrzrUo/xBBekcoMjo+RaTx7PYcovmN6YgDG8zf5d0NNxcyxgPjqMCRs7b4fmRzA87gUrOKb3pkp1fMlYDCfdOmR3fpHPwfE415sFDv7rk5ieCA==|920
+}//B56+yqBPIxx25bXQTM4uMKLAcCQOIYu48fkQqq08NVQxMe1eeFsyv+dJMXBpYW8+bXCqGF4JAS29g6Exxisnoy7WObOm07kKedSKsOMcFBHDO9SLyodYa0qoT+xEHrpM8N66r5GVT3KSVYQNzK5WFlnEwOqs9Nz6k9cun5+AGqQ0p4MPtn/Agxp2kl1/a7hLiYf4iuFSnL9xqNKppCCLoIp+Nxk8b2h6zdFhpHREbqBGSh6oP+6TNLUiiA0tvPJ4cqo7bUVzg2yj5jUqwsMhzhT3qEQOPDn/+1saxQWWqMldO+8OmgDXm9zNveM3dk5gyjnNRacEr2ET2Q1kpVpkY/lzZdS+z2K7Zrz5IKf46HUG7hye+uYx+BOnJC30wsRcsVTl8YpzPt4xbwVLnKlv2MsBnJqV24Dy6BmdJOyYhYno/+0Qf8LccJvxuyJ4EhLz15zu0+4ZlM7a7Lllh0uLHfuNOL+ne6Jfp7kod5urt2elLqDn4FaWmIZGaJbJLxGp76eT0e7fNyGTdJZJbRrTZwgsVMnSUr0sjXQROPXoW4E3bkRCJQMckgFKn1WES916wjp1RNejHX8RLQL70lgrUHnDbG/Vt7ZZ3jaODthT9CPyCC3FqWy83L1F9dQW7GFBS1dYllCmFWr9hUqLctrlUI6hjqjnuny4BqWp2k5PLiQF/ReQF0t6oTanKPuWY38cNWzztLBKPIp9HKRu4GFybnzVhamd1+bDj8NyGwcfAdX6GjpNAaYWOXWz1ohRzp4YquEEECVSdJETYE4cnGpHHRrelLPIsG/LCDzhOP571v2CJSXdKg7VHIB1atMM+BaVsvyPop/SWQxlGXedzau3cNIz6rD0KcibB36Y8kbHkamxPVpAJPnZzLN2uw/vDyEstd8ae4ln/iGDBZnltNpByw==|920
--- a/Pages/汇报/汇报详情.rd
+++ b/Pages/汇报/汇报详情.rd
@@ -7,20 +7,28 @@
  },
  "CustomNames": [
    {
-      "Name": "增加一行按钮",
-      "Formula": "汇报详情!$H$13"
+      "Name": "汇报日期",
+      "Formula": "汇报详情!$H$2"
    },
    {
      "Name": "汇报ID",
      "Formula": "汇报详情!$D$13"
    },
-    {
-      "Name": "汇报日期",
-      "Formula": "汇报详情!$H$2"
-    },
    {
      "Name": "用户全名",
      "Formula": "汇报详情!$Q$13"
+    },
+    {
+      "Name": "增加一行按钮",
+      "Formula": "汇报详情!$H$13"
+    },
+    {
+      "Name": "汇报人",
+      "Formula": "汇报详情!$N$13"
+    },
+    {
+      "Name": "用户名",
+      "Formula": "汇报详情!$T$13"
    }
  ]
 }