From 71c27f9ead97e52e50a59495c6955756e21004cf Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 01 十一月 2024 00:16:13 +0800
Subject: [PATCH] 1101
---
internal_system_v1/converinfo2.cpp | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/internal_system_v1/converinfo2.cpp b/internal_system_v1/converinfo2.cpp
index 0afa25e..c19c391 100644
--- a/internal_system_v1/converinfo2.cpp
+++ b/internal_system_v1/converinfo2.cpp
@@ -64,12 +64,14 @@
m_menu = new QMenu(this);
m_menu->addAction("鍒犻櫎");
m_menu->addAction("澧炲姞");
+ m_menu->addAction("淇濆瓨瀵煎嚭");
ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->treeWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(showMenu(QPoint)));
connect(m_menu->actions().at(0),SIGNAL(triggered(bool)),this,SLOT(deleteInfo()));
connect(m_menu->actions().at(1),SIGNAL(triggered(bool)),this,SLOT(addInfo()));
+ connect(m_menu->actions().at(2),SIGNAL(triggered(bool)),this,SLOT(saveInfo()));
// 鍗曚綅鍐呭淇敼
// 鍙宠竟鍙紪杈戝唴瀹�
@@ -103,11 +105,30 @@
qDebug()<<"鍒犻櫎鏁伴噺:"<<resList.size();
}
+void ConverInfo2::saveInfo()
+{
+ if(m_curItem==nullptr)return;
+ qDebug()<<"淇濆瓨鍏徃淇℃伅,鑺傜偣锛�"<<m_curItem->text(0);
+ QString name = m_curItem->text(0);
+ if(name.contains("(鏈骇)")){
+ name = name.split("(鏈骇)").at(0);
+ }else if(name.contains("(姹囨��)")){
+ name = name.split("(姹囨��)").at(0);
+ name = name + "(姹囨��)";
+ }
+ qDebug()<<"淇濆瓨鍏徃鍚�:"<<name;
+ ComInfo cif = m_nameAndComInfos[name];
+ ExportToFile etf(this);
+ etf.saveToExcelFromComInfo(cif);
+
+}
+
void ConverInfo2::on_treeWidget_doubleClicked(const QModelIndex &index)
{
QString name = index.model()->data(index).toString();
qDebug()<<"鍙屽嚮"<<index<<name;
- ComInfo curCominfo = m_nameAndComInfos[name];
+
+ ComInfo curCominfo; // 涓嶈鐩存帴缁欏�硷紝鍙兘浼氬鑷村娣诲姞鏂扮殑鍚嶅瓧杩涙潵
if(name.contains("(鏈骇)")){
QStringList sps = name.split("(鏈骇)");
name = sps.at(0);
@@ -146,7 +167,16 @@
}
curCominfo = allCominfo;
+ // 澶勭悊瀹屼簡涔嬪悗锛岃繕闇�瑕佸崟鐙捣涓�涓眹鎬荤殑鍚嶅瓧
+ name = name + "(姹囨��)";
+ strcpy(curCominfo.name,name.toLocal8Bit().data());
+ m_nameAndComInfos[name] = curCominfo;
+ // 鍒锋柊缁勫悎涓嬫媺妗嗙殑鍒楄〃
+ emit updateComboListSignal(m_nameAndComInfos);
+
+ }else{
+ curCominfo = m_nameAndComInfos[name];
}
//ComInfo curCominfo = m_nameAndComInfos[name];
// 涓�銆佸崟浣嶅熀鏈儏鍐�
@@ -769,6 +799,9 @@
// 鍙戝皠 鍔犺浇瀹屾垚鐨勪俊鍙�
emit loadFinished();
+ // 鏇存柊鍏朵粬鐣岄潰鐨勫叕鍙镐俊鎭笅鎷夋
+ emit updateComboListSignal(m_nameAndComInfos);
+
// QAxObject excel("./debug/Data/闄勪欢2_鍐呭缁�01琛╛鍗曚綅鍙婂唴閮ㄥ璁℃満鏋勫熀鏈儏鍐佃〃-1.301鐗�(1).xls");
// excel.setProperty("Visible",true);
// excel.setProperty("DisplayAlerts",false);
@@ -785,12 +818,14 @@
m_menu->addAction("鍒犻櫎");
m_menu->addAction("澧炲姞");
+ m_menu->addAction("淇濆瓨瀵煎嚭");
ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->treeWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(showMenu(QPoint)));
connect(m_menu->actions().at(0),SIGNAL(triggered(bool)),this,SLOT(deleteInfo()));
connect(m_menu->actions().at(1),SIGNAL(triggered(bool)),this,SLOT(addInfo()));
+ connect(m_menu->actions().at(2),SIGNAL(triggered(bool)),this,SLOT(saveInfo()));
}
void ConverInfo2::on_pushButton_commit_clicked()
@@ -1600,6 +1635,7 @@
excel.dynamicCall("Quit(void)");
qDebug()<<"鍗曚綅淇℃伅鏁伴噺锛�"<<m_nameAndComInfos.size();
+ emit updateComboListSignal(m_nameAndComInfos); // 鏇存柊缁勫悎涓嬫媺妗嗙殑鍗曚綅淇℃伅
}
void ConverInfo2::createTreeNode(){
--
Gitblit v1.8.0