{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目周报首页"}],"Version":"v1"}

2024-04-27 20:11:15 +08:00
parent 7a056c9a42
commit f5b459f491
5 changed files with 568 additions and 533 deletions
--- a/.collaboration
+++ b/.collaboration
@@ -1550,17 +1550,7 @@
  },
  {
    "ModuleName": "PCPage/项目周报首页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-27T19:55:54.3695959+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\项目周报\\项目周报首页.json",
-      "Pages\\汇报\\项目周报\\项目周报首页.rd"
-    ]
+    "ModuleType": 1
  },
  {
    "ModuleName": "Pages/汇报/日报",
--- a/Pages/50f88f59718b4ba78fa3fc76286d95b.json
+++ b/Pages/50f88f59718b4ba78fa3fc76286d95b.json
@@ -0,0 +1,476 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0,
+          "Mode": 1
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0,
+          "IsHidden": true
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0,
+          "IsHidden": true
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0,
+          "Mode": 1,
+          "IsHidden": true
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0,
+          "IsHidden": true
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 28.0,
+          "IsHidden": true
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 21.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 21.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      5,
+      6,
+      7,
+      8,
+      9,
+      11,
+      12
+    ],
+    "Count": 13,
+    "DefaultSize": 24.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 27.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 50.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 50.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 50.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 665.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 46.0
+        }
+      }
+    },
+    "Count": 9,
+    "DefaultSize": 50.0
+  },
+  "Values": {
+    "3,1": "上周工作：",
+    "6,1": "本周计划：",
+    "9,1": "删除",
+    "9,3": "复制",
+    "9,5": "编辑"
+  },
+  "AttachInfos": {
+    "1,0": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "Location": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='50f88f59718b4ba78fa3fc76286d95b'!6:10"
+                },
+                "Value": true
+              }
+            ]
+          },
+          {
+            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "TargetCells": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='50f88f59718b4ba78fa3fc76286d95b'!A2"
+                },
+                "PropertyType": 1,
+                "Value": false
+              }
+            ]
+          }
+        ],
+        "Size": 12,
+        "ImagePath": "Arrow/350_right_arrow.svg",
+        "BuiltIn": true,
+        "UseCellForeColor": true
+      }
+    },
+    "1,1": {
+      "TemplateCellSource": "标题"
+    },
+    "4,1": {
+      "TemplateCellSource": "上周工作"
+    },
+    "7,1": {
+      "TemplateCellSource": "本周计划"
+    },
+    "9,1": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+            "TableName": "项目周报",
+            "UpdateType": "delete",
+            "ShowConfirm": true,
+            "ConfirmText": "您确定要删除吗？",
+            "ReloadAfterSucceed": false
+          },
+          {
+            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+            "Message": "操作成功"
+          }
+        ],
+        "Text": "删除",
+        "TemplateKey": "_RS_Error3"
+      }
+    },
+    "9,3": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+            "ParameterName": "周报",
+            "TableValue": {
+              "TableName": "项目周报",
+              "TableValueType": 1,
+              "BindingInfos": [
+                {
+                  "GUID": "f9ceb71b-3f5a-45ff-a74e-f26305cf7a4d",
+                  "BindingInfo": {
+                    "TableName": "项目周报",
+                    "ColumnName": "汇报日期",
+                    "GUID": "ef922653-a734-4bd7-9d37-5e8f71207366"
+                  },
+                  "ColumnName": "汇报日期"
+                },
+                {
+                  "GUID": "97d234fe-042b-43f3-b843-e7e6d3b21efa",
+                  "BindingInfo": {
+                    "TableName": "项目周报",
+                    "ColumnName": "项目ID",
+                    "GUID": "f4d4bd77-eb9d-4988-a6bf-fa9b7a2499dc",
+                    "RelationBinding": {
+                      "RelatedTable": "项目表",
+                      "RelatedColumn": "ID",
+                      "DisplayColumn": "项目代号"
+                    }
+                  },
+                  "ColumnName": "项目代号"
+                },
+                {
+                  "GUID": "1a4f3e7d-180d-4c88-b911-fc3d0bd6603b",
+                  "BindingInfo": {
+                    "TableName": "项目周报",
+                    "ColumnName": "上周工作",
+                    "GUID": "256cb11f-7f63-4394-b854-d636900ab42b"
+                  },
+                  "ColumnName": "上周工作"
+                },
+                {
+                  "GUID": "2b6bcfba-ea32-4d0c-a893-6cbbea174546",
+                  "BindingInfo": {
+                    "TableName": "项目周报",
+                    "ColumnName": "本周计划",
+                    "GUID": "6309fec3-f3c5-4904-9a2f-68b54bc540ad"
+                  },
+                  "ColumnName": "本周计划"
+                },
+                {
+                  "GUID": "3712b1d7-c2bf-4731-b294-6a7218d6d6a2",
+                  "BindingInfo": {
+                    "TableName": "项目周报",
+                    "ColumnName": "汇报人",
+                    "GUID": "fe18a171-2413-4c90-bd61-ae7683786ab5"
+                  },
+                  "ColumnName": "汇报人"
+                }
+              ],
+              "SqlCondition": {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "项目周报",
+                  "ColumnName": "ID",
+                  "GUID": "eca8b321-8464-4bd8-b9e2-1939c8e7147b"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='50f88f59718b4ba78fa3fc76286d95b'!B12"
+                }
+              },
+              "NullFormulaValueQueryPolicy": 0,
+              "TopCount": "1"
+            },
+            "ID": "58ca3f31b9214365b6c87288156283d2"
+          },
+          {
+            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+            "ParameterName": "生成文本",
+            "ParameterValue": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=TEXT('50f88f59718b4ba78fa3fc76286d95b'!周报.汇报日期,\"yyyy年mm月dd日\")&\" \"&'50f88f59718b4ba78fa3fc76286d95b'!周报.项目代号&\" 周报\"&CHAR(10)&\"上周工作：\"&CHAR(10)&'50f88f59718b4ba78fa3fc76286d95b'!周报.上周工作&CHAR(10)&\"本周计划：\"&CHAR(10)&'50f88f59718b4ba78fa3fc76286d95b'!周报.本周计划"
+            },
+            "ID": "d265dd34ac6d46af80ae28198d51aa3a"
+          },
+          {
+            "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+            "JavaScript": "var text = Forguncy.CommandHelper.getVariableValue(\"生成文本\");\r\nfunction copyTextToClipboard(text) {\r\n    // 使用navigator.clipboard.writeText方法，它返回一个Promise\r\n    navigator.clipboard.writeText(text).then(function() {\r\n    }).catch(function(err) {\r\n    });\r\n}\r\ncopyTextToClipboard(text);",
+            "ID": "da1c88b3d7194a3485512b91774453f2"
+          },
+          {
+            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+            "Message": "已复制到剪切板！"
+          }
+        ],
+        "Text": "复制",
+        "TemplateKey": "_RS_Success3"
+      }
+    },
+    "9,5": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "ShowDrawerHeader": true,
+            "PageName": "项目周报详情",
+            "LoadBindingDataOption": 1
+          }
+        ],
+        "Text": "编辑",
+        "TemplateKey": "_RS_Main3"
+      }
+    },
+    "11,1": {
+      "TemplateCellSource": "ID"
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 1,
+        "HorizontalAlignment": 2
+      },
+      {
+        "FontSize": 14.666666666666666,
+        "Foreground": 3,
+        "Formatter": 4,
+        "HorizontalAlignment": 5
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Formatter": 6,
+        "HorizontalAlignment": 5
+      },
+      {
+        "Foreground": 1
+      },
+      {
+        "Foreground": 1,
+        "WordWrap": true
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 1,
+        "Formatter": 7
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 1
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 1,
+        "WordWrap": true
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "WordWrap": true
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "Text 1 50",
+        "Right",
+        "black",
+        "yyyy/m/d",
+        "Left",
+        "\"第\"0\"周\"",
+        "[AUTO]General"
+      ]
+    },
+    "CellStyles": {
+      "1,0": 0,
+      "1,1": 1,
+      "1,6": 2,
+      "3,1": 3,
+      "3,2": 3,
+      "3,3": 3,
+      "3,4": 3,
+      "3,5": 3,
+      "3,6": 3,
+      "3,7": 3,
+      "4,1": 4,
+      "5,1": 3,
+      "5,2": 3,
+      "5,3": 3,
+      "5,4": 3,
+      "5,5": 3,
+      "5,6": 3,
+      "5,7": 3,
+      "6,0": 5,
+      "6,1": 6,
+      "6,2": 6,
+      "6,3": 7,
+      "6,4": 7,
+      "6,5": 7,
+      "6,6": 7,
+      "6,7": 7,
+      "6,8": 5,
+      "7,0": 5,
+      "7,1": 8,
+      "7,8": 5,
+      "8,0": 5,
+      "8,1": 9,
+      "8,2": 9,
+      "8,3": 9,
+      "8,4": 9,
+      "8,5": 9,
+      "8,6": 9,
+      "8,7": 9,
+      "8,8": 5,
+      "9,0": 5,
+      "9,1": 9,
+      "9,2": 9,
+      "9,3": 9,
+      "9,4": 9,
+      "9,5": 9,
+      "9,8": 5
+    },
+    "SheetStyle": {
+      "FontFamily": 0,
+      "FontSize": 13.333333333333332
+    }
+  },
+  "Spans": [
+    "4,1,1,7",
+    "7,1,1,7",
+    "1,1,1,5",
+    "3,1,1,2",
+    "6,1,1,2"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+    "ParentPageName": "项目周报首页"
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  }
+}//ie3AKVraTDOO2xviAfPvIjDD6vDsqRGvtMQUT+0FCnwD19Msec1OY9HwLrA1w65wsEO06wwbvq61I0Po0EAqWmW+jgU3CfnEN/b70nUFTm/8vM+x0v7/4p5rTZ+LjujlZyNLoeHA2ObUBur+A35C5tuWjbc6+w2XiZ9tG3Fy8UbyFlhxocPQySLt4M/GiYS/ns0rnLgr3JQ+574NnfmbiThIKcHKcTCiwRlnQMW7eHDZcjfHj5TlumKXwjMVXNJhX4kJH9ZBeIzchZL47Wmy8JmdnJTNnXzf1WFSC10hcQkYUT1BYd4tv4vyRyTymcN6KZUhMlK6Bnnl7VfmhIB6Ipn3jC4q01fIpL5WnLceHiPz5Mzre97vuI0rBJixTiXJqaoqmPwg38usPXkgWCCMCIVvF1f4LMKX2vafVmqeu0Jm9jcjqoB9h3O86T7YNwGMneEu08wXRKcqUn6zepS97himVr+2y6Gb3GW4aX0Zdt7mwnZUXprQGJPavixDv1Txx9NRrT2PgI7pU7XLy2Sdyw4DvgQAw22ufwVXkr/16XIUYFsJSaRui/SR5KuwwezI55U5L7mvBWFZVO6LvR5K3dLXByAkpkT8WT8lhj3p1WgzHtvtJYyjW4Fm+zqK+8CFIIrEIMbndZVmmXQU6ClHOs01hwNiVv4kNA5n4Njr4/hIWtnESFWdYbJvlWZIPXoAD8FUSR6UcrRQ0YDw422K2jvIgsuBfM8IoJAMCqxeUlx7mgGfHhN4Cn3ClqUUv3+QVaku5Gzs1H4ESwYIXIE5YEdeAhVd+lglVnoz38CQ8SJW2NSv/bMjcg5HZ/UZmbgSkiw/lf0kZT47ZbJJ7U/i4UcJUEi6sS1qgoKswSm+9y8oBQOL6SRy00wzLJopo6z2h6wOSho1xcsFYINhv1+F5g==|920
--- a/Pages/50f88f59718b4ba78fa3fc76286d95b.rd
+++ b/Pages/50f88f59718b4ba78fa3fc76286d95b.rd
@@ -0,0 +1,5 @@
+{
+  "PageType": 2,
+  "ColumnCount": 9,
+  "RowCount": 13
+}
--- a/Pages/汇报/项目周报/项目周报首页.json
+++ b/Pages/汇报/项目周报/项目周报首页.json
@@ -3,70 +3,22 @@
    "RowColumnAttachedInfos": {
      "0": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
-      },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 15.0
        }
      },
      "2": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "3": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "4": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "5": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "6": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "8": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
-        }
-      },
-      "9": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 38.0,
-          "Mode": 1
-        }
-      },
-      "10": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 15.0
        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 342.0
+        }
      }
    },
-    "Count": 11,
-    "DefaultSize": 32.0
+    "Count": 3,
+    "DefaultSize": 15.0
  },
  "Cols": {
    "RowColumnAttachedInfos": {
@@ -239,532 +191,156 @@
  "AttachInfos": {
    "1,1": {
      "CellType": {
-        "$type": "ElementUI.TableCellType, ElementUI",
-        "ElTableName": "EL表格1",
-        "RowDoubleClickCommand": {
-          "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
-          "Commands": [
-            {
-              "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
-              "CurrentRowInfo": {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "ColumnBindingInfo": {
-                  "TableName": "客户表",
-                  "ColumnName": "ID",
-                  "GUID": "fc1c30de-7b67-4ecc-a387-2703694f36c2"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目周报首页!行数据.ID"
-                }
-              }
-            },
-            {
-              "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-              "ClosePopupCallbackCommand": {
-                "Commands": [
-                  {
-                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                    "ConditionAndCommandPairList": [
-                      {
-                        "Condition": {
-                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                          "param": {
-                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                            "cellLocations": [
-                              {
-                                "SerializeProperty": "=项目周报首页!是否为确定"
-                              }
-                            ]
-                          },
-                          "value": "1"
-                        },
-                        "CommandList": [
-                          {
-                            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
-                            "TargetPageElement": {
-                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=项目周报首页!B2"
-                            },
-                            "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
-                            "MethodName": "ResetTable",
-                            "ParameterValues": {
-                              "clearSort": true,
-                              "clearFilter": true
-                            }
-                          }
-                        ],
-                        "ID": "5a5e12ba-3b19-468a-b1cf-021872783d58"
-                      }
-                    ]
-                  }
-                ],
-                "ParamProperties": {
-                  "IsOK": "是否为确定"
-                }
-              },
-              "PageName": "客户详情",
-              "LoadBindingDataOption": 1
-            }
-          ],
-          "ParamProperties": {
-            "dataRow": "行数据",
-            "ID0": "行数据.ID",
-            "汇报日期1": "行数据.汇报日期",
-            "项目名称2": "行数据.项目名称",
-            "上周工作3": "行数据.上周工作",
-            "本周计划4": "行数据.本周计划"
-          }
-        },
-        "bindingOptions": {
+        "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+        "TemplatePageName": "50f88f59718b4ba78fa3fc76286d95b",
+        "DataSourceType": 1,
+        "DataSource": {
          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
          "TableName": "项目周报",
          "BindingInfos": [
            {
-              "GUID": "4b683bca-b7cc-4fdd-9654-3cb65ea2b394",
+              "GUID": "ea7f3f92-81e1-4cf7-80a5-df7a05221e5a",
              "BindingInfo": {
                "TableName": "项目周报",
                "ColumnName": "ID",
-                "GUID": "207444a6-e6cb-4db7-9576-aaf95109d29c"
+                "GUID": "fad12084-f917-4f2f-9532-d52ec0c3205d"
              },
              "ColumnName": "ID"
            },
            {
-              "GUID": "72080327-20d7-43a8-a4b7-08e3a2694ab0",
+              "GUID": "bb03aaf0-36bb-45bf-b628-dcac613ccc12",
              "BindingInfo": {
                "TableName": "项目周报",
                "ColumnName": "汇报日期",
-                "GUID": "f01cb541-5094-4598-9734-cb9fad16969f"
+                "GUID": "92faa2ab-67c3-4e06-b65b-2a9c956fdbcf"
              },
              "ColumnName": "汇报日期"
            },
            {
-              "GUID": "45c390e9-446d-4d91-ba99-6095695632a8",
+              "GUID": "b2210073-edcc-4b4d-bf93-e15aa283579d",
              "BindingInfo": {
                "TableName": "项目周报",
                "ColumnName": "周数",
-                "GUID": "78d8a24a-1bea-4afd-8c98-84a7de454254"
+                "GUID": "63ed8f09-19b5-407a-a1f2-a54bfe971213"
              },
              "ColumnName": "周数"
            },
            {
-              "GUID": "bc2bd6cf-87de-4328-861c-9cdc6b42235f",
-              "BindingInfo": {
-                "TableName": "项目周报",
-                "ColumnName": "项目ID",
-                "GUID": "2e2e9c97-baca-4754-b54a-966b2602a07f",
-                "RelationBinding": {
-                  "RelatedTable": "项目表",
-                  "RelatedColumn": "ID",
-                  "DisplayColumn": "项目名称"
-                }
-              },
-              "ColumnName": "项目名称"
-            },
-            {
-              "GUID": "3ea30768-933c-41af-93d0-437fabd485e5",
+              "GUID": "e88191e4-bf20-478f-bb43-c6f0bef97a8f",
              "BindingInfo": {
                "TableName": "项目周报",
                "ColumnName": "上周工作",
-                "GUID": "8d21f468-f9f7-44b3-8642-9fac622b9d94"
+                "GUID": "b3e61065-b988-4c00-be9a-6c10e8a6f352"
              },
              "ColumnName": "上周工作"
            },
            {
-              "GUID": "d47c6b62-191a-4e9c-81cd-7d8d6c1df69b",
+              "GUID": "44f6578e-d861-4f2b-89e8-130b1f94947f",
              "BindingInfo": {
                "TableName": "项目周报",
                "ColumnName": "本周计划",
-                "GUID": "57b6a581-26d2-48ff-a80f-a21fbd4d6d8a"
+                "GUID": "89ae7f21-6c9f-46ec-a2e3-ae1e28de41e2"
              },
              "ColumnName": "本周计划"
+            },
+            {
+              "GUID": "aa2abeef-9982-4856-aa5c-c607a05cc9d8",
+              "BindingInfo": {
+                "TableName": "项目周报",
+                "ColumnName": "汇报人",
+                "GUID": "d27f0bcc-0551-4c71-ad04-851f1a5aad5f",
+                "AttachType": {
+                  "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+                  "UserColumnAttachType": 1
+                }
+              },
+              "ColumnName": "汇报人"
+            },
+            {
+              "GUID": "754ce1c9-3127-4d98-9d82-a079793d35b6",
+              "Formula": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=TEXT(项目周报首页!汇报日期,\"yyyy年mm月dd日\")&\" (第\"&项目周报首页!周数&\"周)\""
+              },
+              "ColumnName": "标题"
            }
          ],
-          "SqlCondition": {
-            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-            "SubConditions": [
-              {
-                "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
-                "CompareType": 6,
-                "ColumnBindingInfo": {
-                  "TableName": "项目周报",
-                  "ColumnName": "项目ID",
-                  "GUID": "af9184f7-1453-4497-aa62-c1be5f180b8d",
-                  "RelationBinding": {
-                    "RelatedTable": "项目表",
-                    "RelatedColumn": "ID",
-                    "DisplayColumn": "项目名称"
-                  }
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目周报首页!关键字"
-                }
-              },
-              {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "ColumnBindingInfo": {
-                  "TableName": "项目周报",
-                  "ColumnName": "汇报人",
-                  "GUID": "15feb917-bc6e-4cf3-98e9-90e705a0ee22"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目周报首页!汇报人"
-                }
-              },
-              {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "CompareType": 3,
-                "ColumnBindingInfo": {
-                  "TableName": "项目周报",
-                  "ColumnName": "汇报日期",
-                  "GUID": "10e4a780-2231-4282-9b64-2bd8f2793295"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目周报首页!开始日期"
-                }
-              },
-              {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "CompareType": 5,
-                "ColumnBindingInfo": {
-                  "TableName": "项目周报",
-                  "ColumnName": "汇报日期",
-                  "GUID": "f884e31a-9557-45a9-a169-da41222cafd7"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目周报首页!结束日期"
-                }
-              }
-            ]
-          },
-          "NullFormulaValueQueryPolicy": 1,
          "OrderBySqlCondition": {
            "OrderByColumns": [
              {
                "ColumnBindingInfo": {
                  "TableName": "项目周报",
                  "ColumnName": "汇报日期",
-                  "GUID": "251e2c8a-afca-4602-aba3-9a57195abb9a"
+                  "GUID": "42755541-91bb-4614-998e-b4d900865767"
                },
                "Order": 1
              }
            ]
          },
+          "IsListviewDataSource": true,
          "CustomColumns": []
        },
-        "autoGenerateColumnsByDataSource": false,
-        "columns": [
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "ID",
-            "label": "ID",
-            "width": 80,
-            "minWidth": 80,
-            "align": "center",
-            "headerAlign": "center",
-            "key": "ef444f18-2d5e-48db-9906-1f77cadc5761"
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "汇报日期",
-            "label": "汇报日期",
-            "formatStr": "yyyy年MM月dd日",
-            "align": "center",
-            "headerAlign": "center",
-            "key": "aa0739c9-a90c-4092-b336-c390e359c039"
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "周数",
-            "label": "周数",
-            "formatStr": "\"第\"0\"周\"",
-            "width": 80,
-            "minWidth": 80,
-            "align": "center",
-            "headerAlign": "center",
-            "key": "07c74c71-e81b-499b-ba5d-f9629cd3b44a"
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "项目名称",
-            "label": "项目名称",
-            "align": "left",
-            "headerAlign": "left",
-            "key": "f6365fad-5d2a-485d-b807-d9c7acde91ee"
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "上周工作",
-            "label": "上周工作",
-            "align": "left",
-            "headerAlign": "left",
-            "showOverflowTooltip": true,
-            "key": "963b2f47-2e36-46af-b59e-dac1e672efcd"
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "本周计划",
-            "label": "本周计划",
-            "align": "left",
-            "headerAlign": "left",
-            "showOverflowTooltip": true,
-            "key": "2daf6d13-9fe5-4a22-9fd7-37f72c39371d"
-          }
-        ],
-        "showActionButtons": true,
-        "actionButtons": [
-          {
-            "$type": "ElementUI.ActionButton, ElementUI",
-            "type": "button",
-            "Name": "编辑",
-            "styleType": "Accent 1 0",
-            "shape": "default",
-            "Commands": {
-              "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
-              "Commands": [
-                {
-                  "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
-                  "CurrentRowInfo": {
-                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                    "ColumnBindingInfo": {
-                      "TableName": "项目周报",
-                      "ColumnName": "ID",
-                      "GUID": "103091b9-7af4-4795-af84-9571802e5fc8"
-                    },
-                    "Value": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目周报首页!行数据.ID"
-                    }
-                  }
-                },
-                {
-                  "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                  "ShowDrawerHeader": true,
-                  "ClosePopupCallbackCommand": {
-                    "Commands": [
-                      {
-                        "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                        "ConditionAndCommandPairList": [
-                          {
-                            "Condition": {
-                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                              "param": {
-                                "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                                "cellLocations": [
-                                  {
-                                    "SerializeProperty": "=项目周报首页!是否为确定"
-                                  }
-                                ]
-                              },
-                              "value": "1"
-                            },
-                            "CommandList": [
-                              {
-                                "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
-                                "TargetPageElement": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=项目周报首页!B2"
-                                },
-                                "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
-                                "MethodName": "ResetTable",
-                                "ParameterValues": {
-                                  "clearSort": true,
-                                  "clearFilter": true
-                                }
-                              }
-                            ],
-                            "ID": "866386fa-e1fd-40fa-aa65-68d0b0da07b1"
-                          }
-                        ]
-                      }
-                    ],
-                    "ParamProperties": {
-                      "IsOK": "是否为确定"
-                    }
-                  },
-                  "PageName": "项目周报详情",
-                  "LoadBindingDataOption": 1
-                }
-              ],
-              "ParamProperties": {
-                "dataRow": "行数据"
-              }
-            }
-          },
-          {
-            "$type": "ElementUI.ActionButton, ElementUI",
-            "type": "button",
-            "Name": "删除",
-            "styleType": "Accent 5",
-            "shape": "default",
-            "Commands": {
-              "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
-              "Commands": [
-                {
-                  "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                  "TableName": "项目周报",
-                  "UpdateType": "delete",
-                  "ShowConfirm": true,
-                  "ConfirmText": "您确定要删除吗？",
-                  "ReloadAfterSucceed": false,
-                  "RowsToUpdate": 1,
-                  "RowsToUpdateCondition": {
-                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                    "ColumnBindingInfo": {
-                      "TableName": "项目周报",
-                      "ColumnName": "ID",
-                      "GUID": "73974e81-f7cf-44d6-be0c-5ded28253945"
-                    },
-                    "Value": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目周报首页!行数据.ID"
-                    }
-                  }
-                },
-                {
-                  "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                  "Message": "操作成功"
-                }
-              ],
-              "ParamProperties": {
-                "dataRow": "行数据"
-              }
-            }
-          }
-        ],
-        "sumText": "合计",
-        "size": "default",
-        "showSelectColumn": true
-      }
-    },
-    "9,1": {
-      "CellType": {
-        "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI",
-        "AttachElementTable": true,
-        "ElementTableName": "EL表格1",
-        "pageSize": 20,
-        "pagerCount": 7,
-        "layout": [
-          {
-            "layoutItem": "prev"
-          },
-          {
-            "layoutItem": "pager"
-          },
-          {
-            "layoutItem": "next"
-          },
-          {
-            "layoutItem": "jumper"
-          },
-          {
-            "layoutItem": "->"
-          },
-          {
-            "layoutItem": "total"
-          }
-        ],
-        "pageSizes": [
-          {},
-          {
-            "value": 20
-          },
-          {
-            "value": 30
-          },
-          {
-            "value": 40
-          },
-          {
-            "value": 50
-          },
-          {
-            "value": 100
-          }
-        ],
-        "hideOnSinglePage": true
+        "DataSourceListviewName": "图文列表表格1",
+        "IsLoadOnDemand": true,
+        "LoadOnDemandCount": 10,
+        "TemplateKey": "横向分割"
      }
    }
  },
  "StyleDatas": {
    "Styles": [
      {
-        "BorderRight": 0
+        "HorizontalAlignment": 0
      },
      {
        "FontSize": 13.333333333333332
-      },
-      {
-        "FontSize": 13.333333333333332,
-        "BorderRight": 0
      }
    ],
    "Types": {
      "Strs": [
-        "Background 2 0",
+        "Center",
        "Body"
-      ],
-      "Borders": [
-        {
-          "Color": 0
-        }
      ]
    },
    "CellStyles": {
-      "0,30": 0,
-      "1,30": 0,
-      "2,30": 0,
-      "3,30": 0,
-      "4,30": 0,
-      "5,30": 0,
-      "6,30": 0,
-      "7,30": 0,
-      "8,30": 0,
-      "9,1": 1,
-      "9,29": 1,
-      "9,30": 0,
-      "10,1": 1,
-      "10,2": 1,
-      "10,3": 1,
-      "10,4": 1,
-      "10,5": 1,
-      "10,6": 1,
-      "10,7": 1,
-      "10,8": 1,
-      "10,9": 1,
-      "10,10": 1,
-      "10,11": 1,
-      "10,12": 1,
-      "10,13": 1,
-      "10,14": 1,
-      "10,15": 1,
-      "10,16": 1,
-      "10,17": 1,
-      "10,18": 1,
-      "10,19": 1,
-      "10,20": 1,
-      "10,21": 1,
-      "10,22": 1,
-      "10,23": 1,
-      "10,24": 1,
-      "10,25": 1,
-      "10,26": 1,
-      "10,27": 1,
-      "10,28": 1,
-      "10,29": 1,
-      "10,30": 2
+      "1,1": 0,
+      "2,1": 1,
+      "2,2": 1,
+      "2,3": 1,
+      "2,4": 1,
+      "2,5": 1,
+      "2,6": 1,
+      "2,7": 1,
+      "2,8": 1,
+      "2,9": 1,
+      "2,10": 1,
+      "2,11": 1,
+      "2,12": 1,
+      "2,13": 1,
+      "2,14": 1,
+      "2,15": 1,
+      "2,16": 1,
+      "2,17": 1,
+      "2,18": 1,
+      "2,19": 1,
+      "2,20": 1,
+      "2,21": 1,
+      "2,22": 1,
+      "2,23": 1,
+      "2,24": 1,
+      "2,25": 1,
+      "2,26": 1,
+      "2,27": 1,
+      "2,28": 1,
+      "2,29": 1,
+      "2,30": 1
    },
    "SheetStyle": {
      "FontFamily": 1
    }
  },
  "Spans": [
-    "9,1,1,28",
-    "1,1,7,29"
+    "1,1,1,29"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -796,11 +372,5 @@
  "PrintInfo": {
    "PaperSize": {},
    "Margin": {}
-  },
-  "CustomNames": [
-    {
-      "Name": "项目周报表格",
-      "Formula": "项目周报首页!$B$2"
-    }
-  ]
-}//NYybvG5vYpKvJcRDyN5fo+Nscr2VdPBQ7X4pf4PBISgRzGDEqvEgy0FRuGU/aFvcVzHUO0jdXRvONpG5d2qlMdqK3O7eiPAClNiY5pX/5FAeGK++g61oL4mbkQ24T2jNs253JxpnP85iSty5UH/SX1+PGBcRrywbVDlDOrM9GOuyAgvBQvmtEdTbK3Fi4Li5Hw5wqWWgWsV2avqnqu/0XpDfCNHaDSxl1Ecd+q/DZOSBC+PuoeNugFBjzSsyecAbCyHUn6nB1Ea0cBgUyO7PPrywRP4mpKYAgoeUSVWl+xosrtdAZcvewy87351jVU99EaUUQlLgXSCRpivt2ueKJXJL+See2mmFA82AOUajS7Jpzzm5eA2SB00eCgoqdqeZ+v+K1wXhbbAdHZW4nIK74NIhsiFKoHtpYGyuL/82PdcPth1A5gVEh94sbcWY1d4MXwVHndivl56rAkkIUD7N6mWxwmq8I4s6a+BzWI6c0V2z3VfIxQOkGwzFn/PGSy39z63bmBKENXpDUCXuYc5LF1P79QrgeDgy91HmV829cFXzq+PKz2kbGqGomIaxtQ9A+9NGfhhIDudF9ACzUUsoZnyTuJVYKtSSLZ6u0Yzi3SnTZ/4eGTaadUQxHxI1+wV2MOzzM/5PFumf8v6nA6T2SCZmBNUw0Gibzqhv6WhGOqCVxnzGSvtAH7dBIAfhO7/niRxCcfOUp9jFy7GKtrei0TJskCMzUuDStfofZ9OXO9YzxR6vxiqZT/r2k3b79WgSXMMRvtm0Hm2R0tfMV8ghY0py78cJsWya8cJw0yjZeMmC5PthJx4KPktQvJWl2govLdrNBH2Dr75xs52G+UpZLaxUkYEvXsLQY5hVlkMBoKFTy71jf1tdBKnBN70UpeZEkTn8Dtgtxj3qx/ArbKFmkA==|920
+  }
+}//H+87XtiW+dc+VvPZpOM8I8T3iwXy1UA4DHNkpFSLCI9sd1OVru8WeTTODOaHajNxfNRKJPaXxYk98DXPVtb4EWmbf8CL+RMy9tbsy8jI9HOugIdpEqszmb9vWTIVRxhkGROxuPvp2nbRiZURtfYjgGZUbQTvPMeGaHHBUL5ixyI00mOCjLRw+riVKR0PZKE8jFyliaXgp+OXh6Kfrscs2T3ujle8MOPlD6KxRYXZXecbFPtuz9cdY8/SGo+r3oCKqyRn37YvwqoadRw4Ek6uu2p8ReFZWSmwgXO2Ur3c88+DD5eBJnSLSL7F0VaYlYeF0OFaby6UXtN3s86Gj8oLvrAkDacJrwEZ0vgvTbjgKxLkYMAbRYjkn7GiB0rlG8OsVx6WA2wM56kwjYAFt7sT5RJANC2W4Hsz4BwBubpEUETVpzSUhaALku65FzMWIOBfQR0tjysIDTOH7MIbxYZIs2pllCKGCa+DQThHifxNRbhaMaOIlgwqgJw0X80Qy34gMVC4dPQS8I95/2lRQ46y9Lz3IrjnNQQWExmDeUkCZlDGrsof1hvvXeBFsv3jK5/D747t8BBn7UHmCUOs24FKKMuTs10TE8u7GWfXLqCWjBYmLM/G6F4dIlijAWPbJImaVhBsI78BHKOho1CX9KTUi79OD5BT6m6TeZ+c81QMKzRXfbibKFl/J0GY9Qr041P2p6MZe5lS5ZTjd9KWK36hhf9d3vy2l0waigifDSAtrAFjT+yGE1ye7PsoH5iLm/r2PsAHnxcgtNr0exSr/WCk4J/f5ftuLGBGsApDYXSffg5IYFupZ7w76U2TkExA2v67MVYqhgKrlEo7dJB9drzjFSk4pRLWfDZPVWLzK3LosgRtgLKSrcNAus1PUgWbeMekTeBg4lwKVaG0XLv7WjKZ8Q==|920
--- a/Pages/汇报/项目周报/项目周报首页.rd
+++ b/Pages/汇报/项目周报/项目周报首页.rd
@@ -1,11 +1,5 @@
 {
  "PageType": 0,
  "ColumnCount": 31,
-  "RowCount": 11,
-  "CustomNames": [
-    {
-      "Name": "项目周报表格",
-      "Formula": "项目周报首页!$B$2"
-    }
-  ]
+  "RowCount": 3
 }