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 |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index fb1bcec..acd0557 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -13,6 +13,10 @@
 #include "datedelegate.h"
 #include "struct_data.h"
 
+#include "tableitemdelegate.h"
+#include "exporttofile.h"
+
+
 #include <QPdfWriter>
 //#include <QtWebEngineWidgets/QtWebEngineWidgets>
 
@@ -83,6 +87,10 @@
 
     void updateComboList(QMap<QString,ComInfo> &); // 鏇存柊涓嬫媺妗嗗叕鍙稿悕
 
+    void on_pushButton_save_export_clicked();
+
+    void on_tableWidget_cellChanged(int row, int column);
+
 private:
     Ui::ThreeMergeProblemList *ui;
     QMenu *m_menu; // 闂娓呭崟鑿滃崟
@@ -98,8 +106,18 @@
     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鏂囦欢
 };

--
Gitblit v1.8.0