{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/审批结算申请单"},{"State":1,"Type":1,"Name":"PCPage/人员工时统计"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/自动生成昨日日报"},{"State":1,"Type":15,"Name":"ServerCommand/根据汇报模板生成内容"},{"State":1,"Type":16,"Name":"TaskScheduler/每日根据报工自动生成工作日报"},{"State":1,"Type":11,"Name":"UserService"}],"Version":"v1"}

2024-08-30 21:51:32 +08:00
parent 1dbefc63c3
commit b9f0633eaa
7 changed files with 165 additions and 158 deletions
--- a/Pages/工时/人员工时统计.json
+++ b/Pages/工时/人员工时统计.json
@@ -181,7 +181,7 @@
          "DesignLengthInPixel": 32.0
        }
      },
-      "30": {
+      "38": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0,
          "Mode": 2,
@@ -193,60 +193,46 @@
          }
        }
      },
-      "31": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "32": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "33": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "34": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "35": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "36": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "37": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "38": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
      "39": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "40": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "41": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "42": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "43": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "44": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 15.0
        }
      }
    },
-    "Count": 40,
+    "Count": 45,
    "DefaultSize": 32.0
  },
  "Values": {
    "1,1": "成员",
    "1,13": "日期",
-    "1,35": "导出原始数据",
-    "17,9": "执行人"
+    "1,30": "日期",
+    "1,40": "导出原始数据",
+    "17,11": "执行人"
  },
  "AttachInfos": {
    "1,3": {
@@ -317,11 +303,14 @@
        },
        "placeholder": "请选择",
        "noDataText": "无数据",
+        "multiple": true,
+        "collapseTags": true,
        "filterInServerOptions": {
          "matchMethod": "contains",
          "loadingText": "加载中"
        },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "clearable": true
      }
    },
    "1,15": {
@@ -377,17 +366,42 @@
        "endPlaceholder": "结束日期",
        "format": "yyyy年MM月DD日",
        "firstDayOfWeek": 1,
+        "clearable": true,
        "DefautWeekFormat": "yyyy 第 WW 周"
      }
    },
-    "1,35": {
+    "1,32": {
+      "CellType": {
+        "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
+        "Style": 1,
+        "Items": [
+          {
+            "Value": "全部",
+            "DisplayValue": "全部"
+          },
+          {
+            "Value": "计划",
+            "DisplayValue": "计划"
+          },
+          {
+            "Value": "实际",
+            "DisplayValue": "实际"
+          }
+        ]
+      }
+    },
+    "1,40": {
      "CellType": {
        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
        "CommandList": [
          {
            "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon",
-            "ListViewName": "表格1",
-            "NewOtherName": ""
+            "ExportExcelListviewNameMode": 1,
+            "ListViewName": "工时记录导出",
+            "NewOtherName": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=TEXT(人员工时统计!开始日期,\"yyyymmdd\")&\"-\"&TEXT(人员工时统计!结束日期,\"yyyymmdd\")&\"工时信息导出\""
+            }
          }
        ],
        "Text": "导出原始数据",
@@ -405,14 +419,14 @@
      "CellType": {
        "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon",
        "PivotTableSetting": {
-          "SelectedListViewName": "表格1",
+          "SelectedListViewName": "工时记录导出",
          "Rows": [
            {
              "DatabaseColumnName": "执行人",
              "DisplayName": "执行人",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!J19"
+                "SerializeProperty": "=人员工时统计!L19"
              },
              "BackgroundValue": {}
            },
@@ -421,14 +435,14 @@
              "DisplayName": "工时日期",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!F19"
+                "SerializeProperty": "=人员工时统计!H19"
              },
              "Format": "[$-409]yyyy/m/d",
              "BackgroundValue": {
                "DatabaseColumnName": "工时日期",
                "ColumnCell": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=人员工时统计!F19"
+                  "SerializeProperty": "=人员工时统计!H19"
                }
              }
            },
@@ -449,6 +463,14 @@
                "SerializeProperty": "=人员工时统计!D19"
              },
              "BackgroundValue": {}
+            },
+            {
+              "DatabaseColumnName": "执行内容",
+              "DisplayName": "执行内容",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!F19"
+              }
            }
          ],
          "Cols": [
@@ -457,7 +479,7 @@
              "DisplayName": "工时类型",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!H19"
+                "SerializeProperty": "=人员工时统计!J19"
              },
              "BackgroundValue": {}
            }
@@ -468,7 +490,7 @@
              "DisplayName": "工时",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!L19"
+                "SerializeProperty": "=人员工时统计!N19"
              },
              "Aggregator": 0,
              "TotalAggregator": 0,
@@ -491,32 +513,39 @@
              }
            },
            {
-              "DatabaseColumnName": "工时日期",
+              "DatabaseColumnName": "执行内容",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                "SerializeProperty": "=人员工时统计!F19"
              }
            },
            {
-              "DatabaseColumnName": "工时类型",
+              "DatabaseColumnName": "工时日期",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                "SerializeProperty": "=人员工时统计!H19"
              }
            },
            {
-              "DatabaseColumnName": "执行人",
+              "DatabaseColumnName": "工时类型",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                "SerializeProperty": "=人员工时统计!J19"
              }
            },
            {
-              "DatabaseColumnName": "工时",
+              "DatabaseColumnName": "执行人",
              "ColumnCell": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                "SerializeProperty": "=人员工时统计!L19"
              }
+            },
+            {
+              "DatabaseColumnName": "工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!N19"
+              }
            }
          ],
          "CollapseRowHeaderIndex": 0,
@@ -538,21 +567,22 @@
    },
    "17,1": {
      "ListViewInfo": {
-        "Name": "表格1",
+        "Name": "工时记录导出",
        "TableName": "任务工时表",
        "RowIndex": 17,
        "ColumnIndex": 1,
        "RowCount": 4,
-        "ColumnCount": 38,
+        "ColumnCount": 43,
        "SqlCondition": {
          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
          "SubConditions": [
            {
-              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+              "CompareType": 8,
              "ColumnBindingInfo": {
                "TableName": "任务工时表",
                "ColumnName": "执行人",
-                "GUID": "8a030d7b-21fd-48a5-92e9-c7a3159e2395"
+                "GUID": "0faaac25-df75-4a63-a753-39713130b978"
              },
              "Value": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -565,7 +595,7 @@
              "ColumnBindingInfo": {
                "TableName": "任务工时表",
                "ColumnName": "工时日期",
-                "GUID": "6332ba1b-70bc-4fe1-b800-4a4e3ddfe23a"
+                "GUID": "d2a145e1-3348-4d39-90b8-02f870512590"
              },
              "Value": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -578,12 +608,24 @@
              "ColumnBindingInfo": {
                "TableName": "任务工时表",
                "ColumnName": "工时日期",
-                "GUID": "d55aecfd-2c1e-4942-a818-997371d4c9cf"
+                "GUID": "c761d3a8-bb5b-49ad-b0de-8c8b565d352e"
              },
              "Value": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                "SerializeProperty": "=人员工时统计!结束日期"
              }
+            },
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时类型",
+                "GUID": "9beb97c8-ba0f-468d-9a7a-89660386c8e8"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!AG2"
+              }
            }
          ]
        },
@@ -622,6 +664,14 @@
      }
    },
    "18,5": {
+      "NameUsedInJavaScript": "执行内容",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "执行内容",
+        "GUID": "518d2cf0-a2e5-435a-9ec6-5fae4b3c3c57"
+      }
+    },
+    "18,7": {
      "NameUsedInJavaScript": "工时日期",
      "BindingInfo": {
        "TableName": "任务工时表",
@@ -629,7 +679,7 @@
        "GUID": "a3f2ccc5-af3a-4a07-954f-4473e507f377"
      }
    },
-    "18,7": {
+    "18,9": {
      "NameUsedInJavaScript": "工时类型",
      "BindingInfo": {
        "TableName": "任务工时表",
@@ -637,7 +687,7 @@
        "GUID": "c1d027dc-2a55-4af5-a4fb-66924ea0956d"
      }
    },
-    "18,9": {
+    "18,11": {
      "NameUsedInJavaScript": "执行人",
      "BindingInfo": {
        "TableName": "任务工时表",
@@ -649,7 +699,7 @@
        }
      }
    },
-    "18,11": {
+    "18,13": {
      "NameUsedInJavaScript": "工时",
      "BindingInfo": {
        "TableName": "任务工时表",
@@ -698,15 +748,25 @@
      "1,26": 0,
      "1,27": 0,
      "1,28": 0,
+      "1,30": 1,
+      "1,31": 0,
      "3,1": 2,
+      "17,7": 0,
+      "17,8": 0,
      "17,9": 0,
      "17,10": 0,
      "17,11": 0,
      "17,12": 0,
+      "17,13": 0,
+      "17,14": 0,
+      "18,7": 0,
+      "18,8": 0,
      "18,9": 0,
      "18,10": 0,
      "18,11": 0,
-      "18,12": 0
+      "18,12": 0,
+      "18,13": 0,
+      "18,14": 0
    },
    "SheetStyle": {
      "FontFamily": 0,
@@ -714,27 +774,31 @@
    }
  },
  "Spans": [
-    "3,1,13,38",
+    "3,1,13,43",
    "18,1,1,2",
    "18,3,1,2",
-    "18,5,1,2",
-    "18,7,1,2",
    "1,1,1,2",
    "1,13,1,2",
    "1,15,1,14",
    "1,3,1,9",
-    "19,1,2,38",
+    "19,1,2,43",
    "21,1,1,3",
    "21,4,1,3",
+    "1,40,1,4",
+    "18,7,1,2",
    "18,9,1,2",
    "18,11,1,2",
-    "1,35,1,4",
+    "18,13,1,2",
+    "18,5,1,2",
+    "1,30,1,2",
    "17,1,1,2",
    "17,3,1,2",
    "17,5,1,2",
    "17,7,1,2",
    "17,9,1,2",
-    "17,11,1,2"
+    "17,11,1,2",
+    "17,13,1,2",
+    "1,32,1,6"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -754,7 +818,7 @@
    },
    "RowBreakLines": [],
    "RepeatRangeSettings": [],
-    "RelatedDataTableName": "人员工时统计视图"
+    "RelatedDataTableName": "任务工时表"
  },
  "PrintInfo": {
    "PaperSize": {},
@@ -774,4 +838,4 @@
      "Formula": "人员工时统计!$E$22"
    }
  ]
-}//WqWVAJrtVcneowuz/MFCx1c4XLaXdBK8b4qKZJ3yq9hdYg516/N3pxdz6LCvdwn7qlJdkyyG065qp0WgSuYbOHXEaMSFkmnd4sog5GBNgch7Uh3KZf5qK735ugRpfVgOIn8+3fcCK+XEHzTzyWWKeEeGMKj4WMibJQGfgotb4nYgq4GNft9fDUQd+dmMhQHnnlOQA/py1VW1XCeInmOZjHoN19kFsC2DU/ZXODisitbTN/du90RGW6rx2bEv4H4db06gS8lPNci/4fnpePcwmFxIaVFPhdMH8THiE8M6bI+rw7sHRPzTBAxaVRMEfkwlqihgmRguZJXtyIxVnKyXMVLwKy+H1rgwBhunYSBSke8BrZBW1uVfT9IUAnntZWVu9cYtfEVvjjkO5Wd7Nx4e9TfHI2+wBKfSzP5rg81TIMcb5WCbEOp1CsDOcjGZpunFftHubRr2t6Eds/5WSmzwcHNOCiO3frbU1BrrXPatRB0XvYeu2e16y9EcYdD+EY1tXzAC41LYnBjNZxuqZ9d0tGiXdC/DM5UV6SiHCCgcporc4/AA6pZjxqrJIggiaRWllB0fGvJqzgfgkOgmWkkp7diIwsYjO065qGdM9Zp3JLSFy1u8LmHzwQpNJY1IGqcIKscdHgw3p0OtUruRyNHR27hjooa/j8Nq1RKuZRugKmP50OGP+BtkXUwF2mAYRfPdcM30Oi4nxgGeJQJPav/P49oUwaJEnxnWA3KWsNMkR+eUaN7yzVFsYwC6XjmUSYjDimxSQ7Wz3skx9SgD3P7VfmldxxxgeRmwXKYEiQPbW/rKqbXJXk2DT7MqT2XIvwdbk/Flk1mYzE+SrTPBxUUtQgyh6Cd6eKtqcVXuhkf7am/WZTe+Okbn1HsFzs+zwdFux3EsKBbxkakd0pLs7cTZcg==|920
+}//Bck8tkz6GHDqoEr1edT3jgabtzYDQ/LxzR+vFzpeeykXnak2960yNB6qhO0gLAEjCG3pAgbCz/5pdSShmBs6BHe9W749a1cuNpztpYZ4v9RNgxrfX2SMwkhXlvk9RuDykKrVJ3KuGHyoOT0kjcpTLHxVV0K5YhdCoyGgKYiSDYZhVC+wdnUCTxgA9bmo/DPtrf0RnvV/GY7WzxvU4J0Ox0dTB9N7zIjMH0MXTWAMA9hE1rfwRuNpWeYHJVCGvCIkoOZ+gMCELxfUOXtfSzjF62yF3gLLBTSJbJzX9p2y88/8TzgoD8rw896Q0gVubb8YthsCpypF+4OvzxWMzqX05XRjss+PtJfwa8wdNU7t5WJz7dGC287nLDIXjcoD/Q30E9v1vk+j2lUH7H07wlQGwFpxmQnV5JKla/Y3jpaxhy8vMlgODuDP6Z4CkPMtfPM7ia4Utr2FNHsIXyvGYnMhLTQtMZtd8J0x3QRUViQb9mBo7ymmMjOxhR5xuln3BHMCQ2c86+KEmIGQk9TonfCC8gItuTEX4Lm4ssAShxxOCiPkgTrYMiVrlXEyVlHNCpldSUAiI9sgA1+5vLCh47d2MyGAOA+W22JPmzEDXf+pHiuKaK7/lkh+ml3l4irNKG3XCv2KIBWGDFhrQt/zrd+a0m/PWgXBGKKbZhhrULN/lqFN2Sla5QEhesF+ayIn5KeL/xxuwq+Vx8kFuG4V1dxC6kbzgEVhceNUgHitqtCksCPlNlhXC5WvwV0TWvcV54Fd29xb9v4LOYeeeNdUOG1bZ+l2ed35mEvZK+SuF+d1b6zEl6KXf90K/1JoJzQVKUutHZqZ9ewey3JHv2udNgGX+aLJyH+oXkVSmMXz1LCfUxm8hpsVUButKnC6bPniEU8R4EN0EWfh8f2T2BZc8c0wzg==|920
--- a/Pages/工时/人员工时统计.rd
+++ b/Pages/工时/人员工时统计.rd
@@ -1,6 +1,6 @@
 {
  "PageType": 0,
-  "ColumnCount": 40,
+  "ColumnCount": 45,
  "RowCount": 22,
  "CustomNames": [
    {