From 20ffcfb5507daf34f81346ca3dfa4c031e7b2fe3 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期日, 27 四月 2025 22:13:53 +0800
Subject: [PATCH] 0427

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

diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 1600cd2..acd0557 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -11,6 +11,14 @@
 
 #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;
@@ -32,6 +40,14 @@
     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);
@@ -43,7 +59,8 @@
 
     // 鏁存敼鍙拌处
     void showMenuSlotRectBook(QPoint);
-    void deleteActionRectBook();
+    void deleteActionRectBook(); // 鍒犻櫎褰撳墠琛�
+    void saveActionRectBook();  // 淇濆瓨鍗曡 褰撳墠
 
     void on_pushButton_addRow_3_clicked();
 
@@ -56,6 +73,23 @@
     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();
+
+    void on_tableWidget_cellChanged(int row, int column);
 
 private:
     Ui::ThreeMergeProblemList *ui;
@@ -72,8 +106,20 @@
     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