From a3f97ceb36d4cb60bacdfbcb04c364faaca6138a Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 29 十一月 2024 23:29:07 +0800
Subject: [PATCH] 1129
---
internal_system_v1/threemergeproblemlist.h | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
index 81e424a..71ae7ac 100644
--- a/internal_system_v1/threemergeproblemlist.h
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -11,6 +11,10 @@
#include "comboboxdelegate.h"
#include "datedelegate.h"
+#include "struct_data.h"
+//#include "threecombobox.h"
+#include "tableitemdelegate.h"
+
#include <QPdfWriter>
//#include <QtWebEngineWidgets/QtWebEngineWidgets>
@@ -38,7 +42,8 @@
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鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
+ // 淇濇寔璺緞鍔犱笂 id+椤圭洰鍚嶇О
+ int saveFile(QString path, QString id,QString &absSavePath,QString proName); // 鏍规嵁id鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
int loadPdfFile(QString path); // 鍔犺浇pdf鏂囦欢
@@ -79,6 +84,10 @@
void showSaveFile(); // 鏄剧ず宸茬粡淇濆瓨鐨勪綈璇佹枃浠�
+ void updateComboList(QMap<QString,ComInfo> &); // 鏇存柊涓嬫媺妗嗗叕鍙稿悕
+
+ void on_pushButton_save_export_clicked();
+
private:
Ui::ThreeMergeProblemList *ui;
QMenu *m_menu; // 闂娓呭崟鑿滃崟
@@ -94,8 +103,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