{"Message":"新增统计页面\r\n优化部分样式","MessageType":2,"Modules":[{"State":2,"Type":1,"Name":"PCPage/工时首页"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":31,"Name":"UserControlPage/汇报卡片"},{"State":3,"Type":1,"Name":"PCPage/统计首页"}],"Version":"v1"}

UserControlPages/汇报卡片.json

@@ -439,6 +439,22 @@
     "PageLoadedCommandList": [],
     "ConditionFormatRulesCollection": {
       "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!母版_当前用户=\"administrator\")"
+          },
+          "Priority": 4,
+          "GUID": "867f3e7f-071d-47fc-8d3b-cd74d212cb88",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": false,
+          "IsReadOnly": false
+        },
         {
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
@@ -459,7 +475,7 @@
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=汇报卡片!母版_当前用户=汇报卡片!$H$7"
+            "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!母版_当前用户=\"administrator\")"
           },
           "Priority": 2,
           "GUID": "1d846696-f608-4386-81df-c7930ddf7b03",
@@ -495,22 +511,6 @@
             "Underline": null,
             "Strikethrough": null
           }
-        },
-        {
-          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
-          "Formula": {
-            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=汇报卡片!母版_当前用户=汇报卡片!$H$7"
-          },
-          "Priority": 4,
-          "GUID": "867f3e7f-071d-47fc-8d3b-cd74d212cb88",
-          "StyleInfo": {
-            "Underline": null,
-            "Strikethrough": null
-          },
-          "IsDisabled": false,
-          "IsInvisible": false,
-          "IsReadOnly": false
         }
       ]
     }
@@ -519,4 +519,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//kkXMugkQAj0oO7Pfs+/oZ9ZV06avgY+zqWeCPLpdZTlL1NekW5jJQ8CrRck21Y6M4ZG2kKXB4+TjXTP1uFhxHl1k3bjihK7vJIIFb9KkE5JQ3GoWYHNPVgNx/1TqHC9y5U+3Q9/68WRoinomuSXQGZrtGyo43K8sypums7PBpnC0uSH8UyzcxTA2BU94PrBrFkph8S/71maKz5giR/u7WtJBIgaE0Y/cdjq1rWLeQYtl+KmFS0MECgPrTZRGGy7YOXLbNKiFK9FGrjTx2gwyjWPLyOuf6ovC5adgSoNtYyU4dIny59UTpw4+VaYnrp8rtBXWs0yBqvdHR2NO5SiltfCFfC4X7iLzlQQcuNnEYU/bAVj5zr3LNhnlK0zTlbO8KazyQufH4zDlSsebjGEr+q7q7NMCGXKi/NbKfkUmqQL670JON9vph8KjnhNDBlmgRQgHFPNCA94/2Mv2RY2E7BslFf8hoCgQczmfkeHYrCMXm75AhyxCN1RSdZYE68lO7bOeVO/30ub7JGWF7E8JLjWnI9kwtv1AQzqFaVZNDJZdXbOoGe+TvCHWss14grD1YMFd56B4j0p1RZvCiudx7ixWozPfUs+85QV5vX0DaK5RW+p4lj7X/CsFfS3vZgZPPLma3QnQs/44Yeq101Cx0krS8xBvBlDEKSK4lD4dGYv3k8xtufKXpYbzCrkel7YknFKnkhQbk13IS+P29YHiG6js8pxiqrlHP+iaxhvQIFU3aRCdEfUZmiN51BMMBsRUJh7i8WjGrbc9DN2YSIQ8D8z5I6/Y5ZgoWWWwE0Tzsy1tuDIgnf3crHrcPEiRkCAKOfrRR9fch04cKHCIuHZoScsH5r0h0dFGd9oZa2EHFyQW8zdUo470gKfUwuIIqYNt/M1rXuVu3IEcAsD29XqDyg==|920
+}//Y5je/S7+rj8Hydrq0SJbjsSAKdhwmONFIOvxlpxC7McDdwQrYOYTbmJVcY/RMTjMThKQnsmeTqq2JzXoCQ0dVyaE509bELZ6fCtpZDe4hORLoIt8ppeY9haq7RxjfmORTNhPTyi4Hj+D41bIgiDlJ5166aoZY68RKu0GxIv6wRqac8f6KlrVsCkLee2+ecE0G1RQ6PNsGjc7oDsbcuTOhxhytyE29PYNdtv63zP6dB43szj5fCOeIWjSMD4EqbwzNFabuYRHPOpGiTcPmk3HgeBUHhPLF7q9V8zJYkwGxvqabv0I6wOMHmx8ISo2bjsqCjkIxtIWvHtuyXiWxj1KTT1IdNsDOQYIJd53kUBA++o9iRJMNyvS5JprG5pZNwKY/IV2r/FwFQVZh48aurC7VYS9fXYlq9p9bW5bkqVE3S2tOQEqHCuyrBf20XoCt07rWtHl2kQ1ZIUx9/LWoQfWF8MV7Wo+E3aAfUE4f+DD4AYL+K7r5t38QrM1FWPM6dg8d6RA/4oHvHemdMLthLTTZfmtI5mrep/Fpn4MVmc4GLmnBGJyVjhLHh1cyTHwgJLK8RuK1DlJ8/zrrHs/8McH3PCJsbMQwLpvnVmUE4mpvv2jRNyAL/Z3zoPGr+zkrHBTNNFhkIvEclgMksUs0QFWdMaKrBBYMlKBHVpPylbwWF0JARGQ8RiPLuxNpbw77u1aom/+AIyOsE7zdlmUOzgpptLZoM1CrHLRWATILqntLb7y38x2z5zeWAhWAu9c32aS69V1L5F8ypV/xCNBTLzvrzYwa3S0yeDClxfna+vPOLP8aS5bP7Ao3StLB4NNLXh4R4oW2sayyBvhGU32Tdd0VhAxf62IcTXLNAtMtuc8F1RcXsUHD2mNU5iqauhVzspTx01rxjQGoJA4qOAX30OqJw==|920