From e2d10e68e22310fdfcf3c6e13707d791c108ae1a Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 14 十月 2024 22:09:19 +0800
Subject: [PATCH] 1014

---
 internal_system_v1/threemergeproblemlist.h |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index c8be580..81e424a 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -7,6 +7,13 @@
 #include <QAction>
 
 #include "filedialogdelegate.h"
+#include "customheaderview.h"
+
+#include "comboboxdelegate.h"
+#include "datedelegate.h"
+
+#include <QPdfWriter>
+//#include <QtWebEngineWidgets/QtWebEngineWidgets>
 
 namespace Ui {
 class ThreeMergeProblemList;
@@ -28,6 +35,13 @@
     void readCompanyFromSQL();
 
     void loadDataFromSQL(const QString &arg1);
+    int selectSQL(QString sql,QVector<QVector<QString>> &result); // 鎷跨粨鏋滈泦鐨剆ql
+    int changeSQL(QString sql); // 鎷挎潯鏁扮殑sql
+    int saveDataLine(int row); // 淇濆瓨鎸囧畾琛� 鍏堝垽鏂搴旂殑绱㈠紩id鏄惁瀛樺湪锛屽瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欐柊寤烘彃鍏�
+    int saveFile(QString path, QString id,QString &absSavePath); // 鏍规嵁id鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
+
+    int loadPdfFile(QString path); // 鍔犺浇pdf鏂囦欢
+
 private slots:
     // 闂娓呭崟
     void showMenuSlot(QPoint);
@@ -39,7 +53,8 @@
 
     // 鏁存敼鍙拌处
     void showMenuSlotRectBook(QPoint);
-    void deleteActionRectBook();
+    void deleteActionRectBook(); // 鍒犻櫎褰撳墠琛�
+    void saveActionRectBook();  // 淇濆瓨鍗曡 褰撳墠
 
     void on_pushButton_addRow_3_clicked();
 
@@ -53,6 +68,17 @@
 
     void on_pushButton_save_clicked();
 
+
+    void on_pushButton_search_clicked();
+
+    void on_pushButton_save_3_clicked();
+
+    void on_pushButton_moreSearch_clicked();
+
+    void on_pushButton_multiSearch_clicked();
+
+    void showSaveFile(); // 鏄剧ず宸茬粡淇濆瓨鐨勪綈璇佹枃浠�
+
 private:
     Ui::ThreeMergeProblemList *ui;
     QMenu *m_menu; // 闂娓呭崟鑿滃崟
@@ -60,6 +86,18 @@
     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; // 鏃堕棿 骞存湀鏃�
+
+    //QWebEngineView *m_pdfView;  // 浣跨敤娴忚鍣ㄥ姞杞絧df鏂囦欢
 };
 
 #endif // THREEMERGEPROBLEMLIST_H

--
Gitblit v1.8.0