From b11ad2bb1946cf5356037f7a16e4e42558fd955e Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 10 五月 2024 22:37:52 +0800
Subject: [PATCH] 0510

---
 internal_system_v1/threemergeproblemlist.h |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 0c694f6..1600cd2 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -6,6 +6,12 @@
 #include <QMenu>
 #include <QAction>
 
+#include "filedialogdelegate.h"
+#include "customheaderview.h"
+
+#include "comboboxdelegate.h"
+#include "datedelegate.h"
+
 namespace Ui {
 class ThreeMergeProblemList;
 }
@@ -21,9 +27,13 @@
     void initUi();
     void initProblemListUi();
     void initProblemResultUi();
+    void initProblemRectBookUi();
 
     void readCompanyFromSQL();
+
+    void loadDataFromSQL(const QString &arg1);
 private slots:
+    // 闂娓呭崟
     void showMenuSlot(QPoint);
     void deleteAction();
 
@@ -31,17 +41,39 @@
     void showMenuSlotResult(QPoint);
     void deleteActionResult();
 
+    // 鏁存敼鍙拌处
+    void showMenuSlotRectBook(QPoint);
+    void deleteActionRectBook();
+
     void on_pushButton_addRow_3_clicked();
 
     void on_pushButton_addRow_2_clicked();
 
     void on_pushButton_addRow_clicked();
 
+    void on_comboBox_company_currentIndexChanged(const QString &arg1);
+
+    void on_pushButton_save_2_clicked();
+
+    void on_pushButton_save_clicked();
+
 private:
     Ui::ThreeMergeProblemList *ui;
-    QMenu *m_menu;
-    QMenu *m_menuResult;
-    QMenu *m_menuResult_;
+    QMenu *m_menu; // 闂娓呭崟鑿滃崟
+    QMenu *m_menuResult; // 鏁存敼鎴愭灉
+    QMenu *m_menuRectBook; // 鏁存敼鍙拌处
+
+    FileDialogDelegate *m_fdd;
+    CustomHeaderView *m_custonHV;
+
+    ComboBoxDelegate *m_cbb_nw; // 鍐呭鎴栧瀹�
+    DateDelegate *m_date_year; // 瀹¤骞村害
+    ComboBoxDelegate *m_cbb_company; // 瀹¤鍗曚綅
+    ComboBoxDelegate *m_cbb_way; // 瀹¤鏂瑰紡
+    ComboBoxDelegate *m_cbb_pro; // 瀹¤椤圭洰
+    ComboBoxDelegate *m_cbb_file_wri; // 闂鎻忚堪浣愯瘉
+
+    DateDelegate *m_date_ymd; // 鏃堕棿 骞存湀鏃�
 };
 
 #endif // THREEMERGEPROBLEMLIST_H

--
Gitblit v1.8.0