From bbacbbede6a3c7265f165642ab19afb61bbcac8d Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 02 十二月 2024 23:31:57 +0800
Subject: [PATCH] 1202

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

diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 0c694f6..6b60c14 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -6,6 +6,20 @@
 #include <QMenu>
 #include <QAction>
 
+#include "filedialogdelegate.h"
+#include "customheaderview.h"
+
+#include "comboboxdelegate.h"
+#include "datedelegate.h"
+#include "struct_data.h"
+
+#include "tableitemdelegate.h"
+#include "exporttofile.h"
+
+
+#include <QPdfWriter>
+//#include <QtWebEngineWidgets/QtWebEngineWidgets>
+
 namespace Ui {
 class ThreeMergeProblemList;
 }
@@ -21,9 +35,21 @@
     void initUi();
     void initProblemListUi();
     void initProblemResultUi();
+    void initProblemRectBookUi();
 
     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鏄惁瀛樺湪锛屽瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欐柊寤烘彃鍏�
+    // 淇濇寔璺緞鍔犱笂 id+椤圭洰鍚嶇О
+    int saveFile(QString path, QString id,QString &absSavePath,QString proName); // 鏍规嵁id鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
+
+    int loadPdfFile(QString path); // 鍔犺浇pdf鏂囦欢
+
 private slots:
+    // 闂娓呭崟
     void showMenuSlot(QPoint);
     void deleteAction();
 
@@ -31,17 +57,67 @@
     void showMenuSlotResult(QPoint);
     void deleteActionResult();
 
+    // 鏁存敼鍙拌处
+    void showMenuSlotRectBook(QPoint);
+    void deleteActionRectBook(); // 鍒犻櫎褰撳墠琛�
+    void saveActionRectBook();  // 淇濆瓨鍗曡 褰撳墠
+
     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();
+
+
+    void on_pushButton_search_clicked();
+
+    void on_pushButton_save_3_clicked();
+
+    void on_pushButton_moreSearch_clicked();
+
+    void on_pushButton_multiSearch_clicked();
+
+    void showSaveFile(); // 鏄剧ず宸茬粡淇濆瓨鐨勪綈璇佹枃浠�
+
+    void updateComboList(QMap<QString,ComInfo> &); // 鏇存柊涓嬫媺妗嗗叕鍙稿悕
+
+    void on_pushButton_save_export_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; // 闂鎻忚堪浣愯瘉
+    ComboBoxDelegate *m_cbb_money; // 瀹¤鍙戠幇闂閲戦瀹氭�� 24-11.28
+    ComboBoxDelegate *m_cbb_cnt; // 瀹¤鍙戠幇闂涓暟瀹氭��
+    ComboBoxDelegate *m_cbb_result; // 鏁存敼缁撴灉
+    ComboBoxDelegate *m_cbb_type; // 澶勫垎绫诲瀷
+    ComboBoxDelegate *m_cbb_check_res; // 妫�鏌ョ粨鏋�
+    ComboBoxDelegate *m_cbb_money_res; // 閲戦绫绘暣鏀规垚鏋�
+    ComboBoxDelegate *m_cbb_no_money_res; // 闈為噾棰濈被鏁存敼鎴愭灉
+
+
+    DateDelegate *m_date_ymd; // 鏃堕棿 骞存湀鏃�
+    //ThreeComboBox *m_noEdit; // 绂佺敤缂栬緫鍔熻兘
+    TableItemDelegate *m_noEdit;
+
+    //QWebEngineView *m_pdfView;  // 浣跨敤娴忚鍣ㄥ姞杞絧df鏂囦欢
 };
 
 #endif // THREEMERGEPROBLEMLIST_H

--
Gitblit v1.8.0