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/clientmainwindow.h |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/internal_system_v1/clientmainwindow.h b/internal_system_v1/clientmainwindow.h
index 325b821..315aa15 100644
--- a/internal_system_v1/clientmainwindow.h
+++ b/internal_system_v1/clientmainwindow.h
@@ -14,8 +14,15 @@
 #include "coverinfo.h"
 #include "searchinfo.h"
 #include "problemrectstandingbook.h"
+#include "converinfo2.h"
 
 #include "xlsxdocument.h"
+#include "problemlist.h"
+#include "problemrectificationresult.h"
+#include "tableitemdelegate.h"
+#include <QItemDelegate>
+#include "threemergeproblemlist.h"
+
 
 namespace Ui {
 class ClientMainWindow;
@@ -34,6 +41,11 @@
     bool readDataFromSQL(QString name);
     void calc(); // 缁熻缁撴灉锛屽澶勫湴鏂硅Е鍙戜簡鑷姩璋冪敤
     void searchComName();
+
+    void delay(int msec); // 寤舵椂澶勭悊
+
+signals:
+    void loadExcelSignal();
 
 private slots:
     void on_pushButton_auditPro_clicked();
@@ -72,6 +84,22 @@
 
     void on_tableWidget_cellClicked(int row, int column);
 
+    void on_pushButton_save_clicked();
+
+    void on_comboBox_currentIndexChanged(const QString &arg1);
+
+    void on_pushButton_reset_clicked();
+
+    void updateComboList(QMap<QString,ComInfo> & nameAndComInfos); // 鏇存柊涓嬫媺妗嗗垪琛�
+
+    void on_pushButton_save_export_clicked();
+
+    void on_comboBox_company_currentTextChanged(const QString &arg1);
+
+    void on_pushButton_merge_3And1_clicked();
+
+    void on_pushButton_search_clicked();
+
 signals:
     void sendDataToAuditProject(QVariantList);
     void sendDataToAuditWorkLoad(QVariantList);
@@ -96,6 +124,17 @@
     CoverInfo *m_coverInfo;
     SearchInfo *m_searchInfo;
     QMap<QString,int> m_comInfo;
+
+    // 鏂扮増鏈�
+    ConverInfo2* m_conInfo2;
+    ProblemList *m_problemList;
+    ProblemRectificationResult *m_problemRectifResult;
+    TableItemDelegate *m_tableItemDelegate;
+    QItemDelegate *m_editDelegate; // 鍙紪杈�
+
+    // 3鍚堜竴
+    ThreeMergeProblemList *m_threeMPList;
+
 };
 
 #endif // CLIENTMAINWINDOW_H

--
Gitblit v1.8.0