From ac4aaf95358d7eabc5331e30c1272ebb6eba5478 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 13 五月 2024 23:05:03 +0800
Subject: [PATCH] 0513
---
internal_system_v1/converinfo2.h | 2
internal_system_v1/converinfo2.cpp | 540 +++++++++++++++++++++++++++++++++++++++++++++++++++++
internal_system_v1/internal_system_v1.pro.user | 2
internal_system_v1/converinfo2.ui | 4
4 files changed, 544 insertions(+), 4 deletions(-)
diff --git a/internal_system_v1/converinfo2.cpp b/internal_system_v1/converinfo2.cpp
index 977cbe0..a51a114 100644
--- a/internal_system_v1/converinfo2.cpp
+++ b/internal_system_v1/converinfo2.cpp
@@ -17,6 +17,9 @@
//initUi();
readInfo(); // 鍔犺浇琛ㄦ牸
addMenu(); // 澧炲姞鑿滃崟
+
+ // 鑷�傚簲澶勭悊
+ ui->treeWidget->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
}
ConverInfo2::~ConverInfo2()
@@ -995,7 +998,542 @@
}
}
-void ConverInfo2::on_pushButton_laodFile_clicked()
+void ConverInfo2::readExcelFromPath(QString path)
{
+ QAxObject excel("ket.Application");
+ if(!excel.setControl("ket"
+ ".Application")){ // windows鍐呮牳
+ excel.setControl("Excel.Application"); // wps鍐呮牳
+ }
+ excel.setProperty("Visible",false);
+ excel.setProperty("DisplayAlerts",false);
+
+ qDebug()<<"open:"<<path;
+ qDebug()<<"excel:"<<excel.className();
+ QAxObject * wbs = excel.querySubObject("WorkBooks");
+ qDebug()<<"wbs:"<<wbs->className();
+ QAxObject * wb = wbs->querySubObject("Open(QString&)",path);
+ //QAxObject* pWorkBook = excel.querySubObject("ActiveWorkBook");
+ //QAxObject* pWorkSheets = pWorkBook->querySubObject("Sheets");//鑾峰彇宸ヤ綔琛�
+ //QAxObject * shs = wb->querySubObject("Sheets"); // WorkSheets 涔熷彲浠�
+ QAxObject * shs = wb->querySubObject("WorkSheets"); // WorkSheets 涔熷彲浠�
+// // 鎸囧畾鍗曞厓鏍兼嬁
+// QAxObject *cell = shs->querySubObject("Cells(int, int)",82,1);
+// qDebug()<<"Cells:82-0:"<<shs->querySubObject("Cells(int, int)",82,0)->dynamicCall("Value()").toString();
+// qDebug()<<"Cells:82-1:"<<cell->dynamicCall("Value()").toString();
+
+ int cnt = shs->property("Count").toInt();
+ qDebug()<<"cnt="<<cnt;
+ for(int i=0;i<cnt;++i){
+ QAxObject * sheet = shs->querySubObject("Item(int)", i+1);
+ QString sheetName = sheet->property("Name").toString();
+ qDebug()<<"sh name:"<<sheetName;
+ QAxObject *usedRange = sheet->querySubObject("UsedRange");
+ int rows = usedRange->querySubObject("Rows")->property("Count").toInt();
+ int columns = usedRange->querySubObject("Columns")->property("Count").toInt();
+ qDebug()<<"r--c:"<<rows<<columns;
+ QVariant val = usedRange->dynamicCall("Value"); // 鎷垮埌浜岀淮琛ㄦ牸
+ QVariantList valRows = val.toList();
+ // 閬嶅巻姣忎竴椤�
+// for(int i=0;i<rows;++i){
+// QVariantList valrow = valRows[i].toList();
+// for(int j=0;j<columns;++j){
+// QVariant valData = valrow[j];
+// if(valData.isValid()){
+// qDebug()<<"val:"<< i<< j << valData;
+// }
+
+// }
+// }
+
+ // 瀹炰緥鍖栫粨鏋勪綋锛岀劧鍚庢尐涓祴鍊�
+ ComInfo curComInfo;
+
+ // 缁熶竴淇$敤浠g爜
+ QVariant uniCode = valRows[9].toList().at(3);
+ if(uniCode.isValid()){
+ ui->label_creditCode->setText(uniCode.toString());
+ strcpy(curComInfo.creditCode,uniCode.toString().toLocal8Bit().data());
+ }
+ // 鍗曚綅鍚嶇О
+ QVariant name = valRows[9].toList().at(8);
+ if(name.isValid()){
+ ui->label_name->setText(name.toString());
+
+// // 鑿滃崟鐩稿叧 褰撲笂绾у叕鍙镐负绌轰笂绾ф椂锛岃嚜宸卞綋鑷繁鐨勪笂绾э紝骞朵笖缃楀垪杩涘幓褰� 鏈骇
+// QTreeWidgetItem *top1 = new QTreeWidgetItem(ui->treeWidget);
+// top1->setText(0,name.toString());
+
+ strcpy(curComInfo.name,name.toString().toLocal8Bit().data());
+
+ }else{
+ ui->label_name->setText("");
+ }
+ // 鏈烘瀯绫诲瀷
+ QVariant comType = valRows[12].toList().at(3);
+ if(comType.isValid()){
+ ui->label_comType->setText(comType.toString());
+ strcpy(curComInfo.comType,comType.toString().toLocal8Bit().data());
+ }else{
+ ui->label_comType->setText("");
+ }
+ // 涓昏涓氬姟娲诲姩
+ QString business;
+ QVariant first = valRows[18].toList().at(2);
+ if(first.isValid()){
+ business.append(first.toString());
+ }
+ QVariant sec = valRows[18].toList().at(5);
+ if(sec.isValid()){
+ business += "銆�";
+ business.append(sec.toString());
+ }
+ QVariant third = valRows[18].toList().at(8);
+ if(third.isValid()){
+ business += "銆�";
+ business.append(third.toString());
+ }
+ if(business.size() > 0){
+ ui->label_business->setText(business);
+ ui->label_business->setToolTip(business);
+ strcpy(curComInfo.business,business.toLocal8Bit().data());
+ }else{
+ ui->label_business->setText("");
+ }
+ // 涓氬姟浠g爜
+ QVariant busCode = valRows[19].toList().at(4);
+ if(busCode.isValid()){
+ ui->label_businessCode->setText(busCode.toString());
+ strcpy(curComInfo.businessCode,busCode.toString().toLocal8Bit().data());
+ }else{
+ ui->label_businessCode->setText("");
+ }
+ // 娉ㄥ唽鍦板潃
+ QString addr="";
+ QVariant province = valRows[21].toList().at(1); // 鐪佷唤
+ QVariant city = valRows[21].toList().at(4); // 鍩庡競
+ QVariant district = valRows[21].toList().at(7); // 绠¤緰鍖�
+ QVariant village = valRows[22].toList().at(2); // 涔¢晣
+ QVariant street = valRows[22].toList().at(4); // 琛楅亾
+ QVariant Sub = valRows[23].toList().at(2); // 琛楅亾鍔炰簨澶�
+ QVariant committee = valRows[25].toList().at(3); // 灞呭浼�
+ //qDebug()<<province<<city<<district<<village<<street<<Sub<<committee;
+ if(province.isValid()) addr += province.toString();
+ if(city.isValid()) addr += city.toString();
+ if(district.isValid()) addr += district.toString();
+ if(village.isValid()) addr += village.toString();
+ if(street.isValid()) addr += street.toString();
+ if(Sub.isValid()) addr += Sub.toString();
+ if(committee.isValid()) addr += committee.toString();
+ if(addr.size()>10){
+ ui->label_addr->setText(addr);
+ strcpy(curComInfo.addr,addr.toLocal8Bit().data());
+ }else{
+ ui->label_addr->setText("");
+ }
+ // 鍖哄煙浠g爜
+ QVariant areaCode = valRows[24].toList().at(2);
+ if(areaCode.isValid()){
+ ui->label_areaCode->setText(areaCode.toString());
+ strcpy(curComInfo.areaCode,areaCode.toString().toLocal8Bit().data());
+ }else{
+ ui->label_areaCode->setText("");
+ }
+ // 鍩庝埂浠g爜
+ QVariant townCode = valRows[24].toList().at(6);
+ if(townCode.isValid()) {
+ ui->label_townCode->setText(townCode.toString());
+ strcpy(curComInfo.townCode,townCode.toString().toLocal8Bit().data());
+ }else{
+ ui->label_townCode->setText("");
+ }
+
+ // 鍗曚綅瑙勬ā
+ QVariant scale = valRows[25].toList().at(3);
+ if(scale.isValid()){
+ ui->label_scale->setText(scale.toString());
+ strcpy(curComInfo.scale,scale.toString().toLocal8Bit().data());
+ }else{
+ ui->label_scale->setText("");
+ }
+ // 浠庝笟浜烘暟
+ QVariant people = valRows[26].toList().at(6);
+ if(people.isValid()) {
+ ui->label_people->setText(people.toString());
+ //strcpy(curComInfo.people,people.toString().toLocal8Bit().data());
+ curComInfo.people = people.toInt();
+ }else{
+ ui->label_people->setText("");
+ }
+ // 娉曚汉
+ QVariant representative = valRows[27].toList().at(4);
+ if(representative.isValid()) {
+ ui->label_representative->setText(representative.toString());
+ strcpy(curComInfo.representative,representative.toString().toLocal8Bit().data());
+ }else{
+ ui->label_representative->setText("");
+ }
+ // 浼氳鏍囧噯绫诲埆 standardType
+ QVariant standardType = valRows[27].toList().at(8);
+ if(standardType.isValid()){
+ ui->label_standardType->setText(standardType.toString());
+ strcpy(curComInfo.standardType,standardType.toString().toLocal8Bit());
+ }else{
+ ui->label_standardType->setText("");
+ }
+ // 闀块�斿尯鍙�
+ QVariant trunkCode = valRows[31].toList().at(2);
+ if(trunkCode.isValid()){
+ ui->label_trunkCode->setText(trunkCode.toString());
+ strcpy(curComInfo.trunkCode,trunkCode.toString().toLocal8Bit().data());
+ }else{
+ ui->label_trunkCode->setText("");
+ }
+ // 鍥哄畾鐢佃瘽
+ QVariant fixedTel = valRows[32].toList().at(2);
+ if(fixedTel.isValid()) {
+ ui->label_fixedTel->setText(fixedTel.toString());
+ strcpy(curComInfo.fixedTel,fixedTel.toString().toLocal8Bit().data());
+ }else{
+ ui->label_fixedTel->setText("");
+ }
+ // 閭斂缂栫爜
+ QVariant postCode = valRows[33].toList().at(2);
+ if(postCode.isValid()){
+ ui->label_postCode->setText(postCode.toString());
+ strcpy(curComInfo.postCode,postCode.toString().toLocal8Bit().data());
+ }else{
+ ui->label_postCode->setText("");
+ }
+ // 鐢靛瓙閭
+ QVariant email = valRows[30].toList().at(5);
+ if(email.isValid()) {
+ ui->label_email->setText(email.toString());
+ strcpy(curComInfo.email,email.toString().toLocal8Bit().data());
+ }else{
+ ui->label_email->setText("");
+ }
+ // 缃戝潃
+ QVariant webSite = valRows[32].toList().at(5);
+ if(webSite.isValid()) {
+ ui->label_webSite->setText(webSite.toString());
+ strcpy(curComInfo.webSite,webSite.toString().toLocal8Bit().data());
+ }else{
+ ui->label_webSite->setText("");
+ }
+
+ // 浜屻�佸崟浣嶇粍缁囩粨鏋勬儏鍐�
+ // 鏄惁鏈変笂涓�绾ф硶浜�
+ QVariant hasUpLegal = valRows[35].toList().at(4);
+ if(hasUpLegal.isValid()){
+ strcpy(curComInfo.hasUpLegal,hasUpLegal.toString().toLocal8Bit().data());
+ qDebug()<<"has up legal"<<hasUpLegal;
+ }
+ // 涓婄骇娉曚汉鍗曚綅缁熶竴绀句細淇$敤浠g爜
+ QVariant upCreditCode = valRows[36].toList().at(7);
+ if(upCreditCode.isValid()){
+ strcpy(curComInfo.upCreditCode,upCreditCode.toString().toLocal8Bit().data());
+ qDebug()<<"upCreditCode"<<upCreditCode;
+ }else {
+ qDebug()<<"upCreditCode fail"<<name;
+ }
+ // 鍘熺粍缁囨満鏋勪唬鐮�
+ QVariant oldCreditCode = valRows[37].toList().at(7);
+ if(oldCreditCode.isValid()){
+ strcpy(curComInfo.oldCreditCode,oldCreditCode.toString().toLocal8Bit().data());
+ qDebug()<<"oldCreditCode"<<oldCreditCode;
+ }
+ // 涓婁竴绾у崟浣嶈缁嗗悕绉�
+ QVariant upName = valRows[38].toList().at(7);
+ if(upName.isValid()){
+ strcpy(curComInfo.upName,upName.toString().toLocal8Bit().data());
+ qDebug()<<"upName"<<upName;
+ }
+
+ // 鎬诲璁″笀涓庡唴瀹℃満鏋勫熀鏈儏鍐�
+
+ // 鏄惁璁剧疆鎬诲璁″笀
+ QVariant hasChiefDesigner = valRows[40].toList().at(4);
+ if(hasChiefDesigner.isValid()){
+ strcpy(curComInfo.hasChiefDesigner,hasChiefDesigner.toString().toLocal8Bit().data());
+ qDebug()<<"hasChiefDesigner"<<hasChiefDesigner;
+ }
+ // 鎬诲璁″笀鑱屼綅灞傜骇
+ QVariant ChiefDesignerLevel = valRows[41].toList().at(4);
+ if(ChiefDesignerLevel.isValid()){
+ strcpy(curComInfo.ChiefDesignerLevel,ChiefDesignerLevel.toString().toLocal8Bit().data());
+ qDebug()<<"ChiefDesignerLevel"<<ChiefDesignerLevel;
+ }
+ // 鎬诲璁″笀浠昏亴鏂瑰紡
+ QVariant employmentMode = valRows[44].toList().at(4);
+ if(employmentMode.isValid()){
+ strcpy(curComInfo.employmentMode,employmentMode.toString().toLocal8Bit().data());
+ qDebug()<<"employmentMode"<<employmentMode;
+ }
+
+ // 鏄惁璁剧疆鍐呭鏈烘瀯
+ QVariant hasSetIntervalAudit = valRows[47].toList().at(4);
+ if(hasSetIntervalAudit.isValid()){
+ strcpy(curComInfo.hasSetIntervalAudit,hasSetIntervalAudit.toString().toLocal8Bit().data());
+ qDebug()<<"hasSetIntervalAudit"<<hasSetIntervalAudit;
+ }
+ // 鍐呭鏈烘瀯鍚嶇О
+ QVariant internalName = valRows[48].toList().at(4);
+ if(internalName.isValid()){
+ strcpy(curComInfo.internalName,internalName.toString().toLocal8Bit().data());
+ qDebug()<<"internalName"<<internalName;
+ }
+ // 鍐呭宸ヤ綔鐨勯瀵兼満鏋�
+ QVariant leadingOrganization = valRows[49].toList().at(4);
+ if(leadingOrganization.isValid()){
+ strcpy(curComInfo.leadingOrganization,leadingOrganization.toString().toLocal8Bit().data());
+ qDebug()<<"leadingOrganization"<<leadingOrganization;
+ }
+ // 鏄惁鐙珛璁剧疆鍐呭鏈烘瀯
+ QVariant hasSetSeparateIA = valRows[53].toList().at(4);
+ if(hasSetSeparateIA.isValid()){
+ strcpy(curComInfo.hasSetSeparateIA,hasSetSeparateIA.toString().toLocal8Bit().data());
+ qDebug()<<"hasSetSeparateIA"<<hasSetSeparateIA;
+ }
+ // 鍚堝苟璁剧疆 璐㈠姟閮ㄩ棬 澶嶉�夋
+
+ QVariant financeDepartment = valRows[55].toList().at(1);
+ if(financeDepartment.isValid()){
+ //strcpy(curComInfo.financeDepartment,financeDepartment.toString().toLocal8Bit().data());
+ curComInfo.financeDepartment = financeDepartment.toBool();
+ qDebug()<<"financeDepartment"<<financeDepartment;
+ }
+ // 娉曞姟閮ㄩ棬銆佸唴閮ㄦ帶鍒堕儴闂ㄣ�佺邯妫�閮ㄩ棬銆佸叾浠栭儴闂�
+
+ // 鍐呭鏈烘瀯灞傜骇
+ QVariant intavalAuditLeval = valRows[56].toList().at(4);
+ if(intavalAuditLeval.isValid()){
+ strcpy(curComInfo.intavalAuditLeval,intavalAuditLeval.toString().toLocal8Bit().data());
+ qDebug()<<"intavalAuditLeval"<<intavalAuditLeval;
+ }
+
+ // 鍥涖�佸唴瀹′汉鍛橀厤澶囧熀鏈儏鍐�
+ // 缂栧埗鏁�
+ QVariant organazationNum = valRows[56].toList().at(4);
+ if(organazationNum.isValid()){
+ curComInfo.organazationNum = organazationNum.toInt();
+ qDebug()<<"organazationNum"<<organazationNum;
+ }
+ // 瀹炴湁浜哄憳鏁�
+ QVariant realNum = valRows[56].toList().at(4);
+ if(realNum.isValid()){
+ curComInfo.realNum = realNum.toInt();
+ qDebug()<<"realNum"<<realNum;
+ }
+ // 涓撹亴浜哄憳鏁�
+ QVariant professionalNum = valRows[56].toList().at(4);
+ if(professionalNum.isValid()){
+ curComInfo.professionalNum = professionalNum.toInt();
+ qDebug()<<"professionalNum"<<professionalNum;
+ }
+ // 鎷ユ湁CIA浜哄憳鏁�
+ QVariant CIANum = valRows[56].toList().at(4);
+ if(CIANum.isValid()){
+ curComInfo.CIANum = CIANum.toInt();
+ qDebug()<<"CIANum"<<CIANum;
+ }
+ // 瀛﹀巻锛氱澹強浠ヤ笂 浜哄憳鏁�
+ QVariant masterNum = valRows[56].toList().at(4);
+ if(masterNum.isValid()){
+ curComInfo.masterNum = masterNum.toInt();
+ qDebug()<<"masterNum"<<masterNum;
+ }
+ // 澶у鏈
+ QVariant undergraduatesNum = valRows[56].toList().at(4);
+ if(undergraduatesNum.isValid()){
+ curComInfo.undergraduatesNum = undergraduatesNum.toInt();
+ qDebug()<<"undergraduatesNum"<<undergraduatesNum;
+ }
+ // 涓撶鍙婁互涓�
+ QVariant juniorNum = valRows[56].toList().at(4);
+ if(juniorNum.isValid()){
+ curComInfo.juniorNum = juniorNum.toInt();
+ qDebug()<<"juniorNum"<<juniorNum;
+ }
+
+ // 鑱岀О 楂樼骇鑱岀О
+ QVariant seniorNum = valRows[56].toList().at(4);
+ if(seniorNum.isValid()){
+ curComInfo.seniorNum = seniorNum.toInt();
+ qDebug()<<"seniorNum"<<seniorNum;
+ }
+ // 涓骇鑱岀О
+ QVariant intermediateNum = valRows[56].toList().at(4);
+ if(intermediateNum.isValid()){
+ curComInfo.intermediateNum = intermediateNum.toInt();
+ qDebug()<<"intermediateNum"<<intermediateNum;
+ }
+ // 鍒濈骇鑱岀О
+ QVariant primaryNum = valRows[56].toList().at(4);
+ if(primaryNum.isValid()){
+ curComInfo.primaryNum = primaryNum.toInt();
+ qDebug()<<"primaryNum"<<primaryNum;
+ }
+ // 鏃犺亴绉�
+ QVariant noTitleNum = valRows[56].toList().at(4);
+ if(noTitleNum.isValid()){
+ curComInfo.noTitleNum = noTitleNum.toInt();
+ qDebug()<<"noTitleNum"<<noTitleNum;
+ }
+
+ // 骞撮緞缁撴瀯 50宀佷互涓�
+ QVariant upFiftyOldNum = valRows[56].toList().at(4);
+ if(upFiftyOldNum.isValid()){
+ curComInfo.upFiftyOldNum = upFiftyOldNum.toInt();
+ qDebug()<<"upFiftyOldNum"<<upFiftyOldNum;
+ }
+ // 30-50宀�
+ QVariant upThirtyOldNum = valRows[56].toList().at(4);
+ if(upThirtyOldNum.isValid()){
+ curComInfo.upThirtyOldNum = upThirtyOldNum.toInt();
+ qDebug()<<"upThirtyOldNum"<<upThirtyOldNum;
+ }
+ // 30宀佷互涓�
+ QVariant downThirtyOldNum = valRows[56].toList().at(4);
+ if(downThirtyOldNum.isValid()){
+ curComInfo.downThirtyOldNum = downThirtyOldNum.toInt();
+ qDebug()<<"downThirtyOldNum"<<downThirtyOldNum;
+ }
+
+ // 鐭ヨ瘑缁撴瀯 瀹¤
+ QVariant auditNum = valRows[56].toList().at(4);
+ if(auditNum.isValid()){
+ curComInfo.auditNum = auditNum.toInt();
+ qDebug()<<"auditNum"<<auditNum;
+ }
+ // 浼氳
+ QVariant accountingNum = valRows[56].toList().at(4);
+ if(accountingNum.isValid()){
+ curComInfo.accountingNum = accountingNum.toInt();
+ qDebug()<<"accountingNum"<<accountingNum;
+ }
+ // 缁忔祹
+ QVariant economyNum = valRows[56].toList().at(4);
+ if(economyNum.isValid()){
+ curComInfo.economyNum = economyNum.toInt();
+ qDebug()<<"economyNum"<<economyNum;
+ }
+ // 娉曞緥
+ QVariant lawNum = valRows[56].toList().at(4);
+ if(lawNum.isValid()){
+ curComInfo.lawNum = lawNum.toInt();
+ qDebug()<<"lawNum"<<lawNum;
+ }
+ // 绠$悊
+ QVariant managerNum = valRows[56].toList().at(4);
+ if(managerNum.isValid()){
+ curComInfo.managerNum = managerNum.toInt();
+ qDebug()<<"managerNum"<<managerNum;
+ }
+ // 淇℃伅鎶�鏈�
+ QVariant itNum = valRows[56].toList().at(4);
+ if(itNum.isValid()){
+ curComInfo.itNum = itNum.toInt();
+ qDebug()<<"itNum"<<itNum;
+ }
+ // 宸ョ▼
+ QVariant engineeringNum = valRows[56].toList().at(4);
+ if(engineeringNum.isValid()){
+ curComInfo.engineeringNum = engineeringNum.toInt();
+ qDebug()<<"engineeringNum"<<engineeringNum;
+ }
+ // 鍏朵粬
+ QVariant otherNum = valRows[56].toList().at(4);
+ if(otherNum.isValid()){
+ curComInfo.otherNum = otherNum.toInt();
+ qDebug()<<"otherNum"<<otherNum;
+ }
+
+ // 鍚庨潰鐨�4涓俊鎭�
+ // 缁熻璐熻矗浜�
+ QVariant statisticalConOfficer = valRows[81].toList().at(1);
+ if(statisticalConOfficer.isValid()){
+ strcpy(curComInfo.statisticalConOfficer,statisticalConOfficer.toString().toLocal8Bit().data());
+ qDebug()<<"statisticalConOfficer"<<statisticalConOfficer;
+ }else{
+ qDebug()<<"statisticalConOfficer fail:"<<name.toString();
+ }
+ // 濉〃浜�
+ QVariant personFilling = valRows[81].toList().at(4);
+ if(personFilling.isValid()){
+ strcpy(curComInfo.personFilling,personFilling.toString().toLocal8Bit().data());
+ qDebug()<<"personFilling"<<personFilling;
+ }
+ // 鑱旂郴鐢佃瘽
+ QVariant officerTel = valRows[82].toList().at(1);
+ if(officerTel.isValid()){
+ strcpy(curComInfo.officerTel,officerTel.toString().toLocal8Bit().data());
+ qDebug()<<"officerTel"<<officerTel;
+ }
+ // 濉姤鏃ユ湡
+ QVariant fillingDateTime = valRows[82].toList().at(4);
+ if(fillingDateTime.isValid()){
+ strcpy(curComInfo.fillingDateTime,fillingDateTime.toString().toLocal8Bit().data());
+ qDebug()<<"fillingDateTime"<<fillingDateTime;
+ }
+
+ // 鏈�鍚庡瓨鍒癿ap涓�
+ m_nameAndComInfos[name.toString()]=curComInfo;
+
+
+ // 娣诲姞宸﹁竟鏍戝舰鍥剧浉鍏�
+ // 鑿滃崟鐩稿叧 褰撲笂绾у叕鍙镐负绌轰笂绾ф椂锛岃嚜宸卞綋鑷繁鐨勪笂绾э紝骞朵笖缃楀垪杩涘幓褰� 鏈骇
+
+ if(upName.isValid()) // 鏈夋晥
+ {
+ // 鍒ゆ柇椤跺眰鏍戣妭鐐规槸鍚﹀凡缁忓瓨鍦�
+ QTreeWidgetItem *top = nullptr;
+ for(int k=0;k<ui->treeWidget->topLevelItemCount();++k){
+ QTreeWidgetItem *tmp = ui->treeWidget->topLevelItem(k);
+ qDebug()<<k<<tmp->text(0)<<upName.toString();
+ if(upName.toString()+"(姹囨��)" == tmp->text(0)){
+ top = tmp;
+ break;
+ }
+ }
+ if(name.isValid()){
+ if(top){ // 瀛樺湪锛屽垯娣诲姞鍒板瀛愬垪琛ㄤ腑
+ QTreeWidgetItem *top1 = new QTreeWidgetItem(top);
+ top1->setText(0,name.toString());
+ }else{ // 涓嶅瓨鍦紝鍒欐柊寤轰竴涓垪琛�
+ QTreeWidgetItem *top1 = new QTreeWidgetItem(ui->treeWidget);
+ top1->setText(0,name.toString()+"(姹囨��)");
+ QTreeWidgetItem *top2 = new QTreeWidgetItem(top1);
+ top2->setText(0,name.toString()+"(鏈骇)");
+ }
+ }
+
+
+ }else{
+ qDebug()<<"娌″彂鐜颁笂涓�绾э紝鍙兘鑷繁褰�"<<name;
+ if(name.isValid()){
+ QTreeWidgetItem *top1 = new QTreeWidgetItem(ui->treeWidget);
+ top1->setText(0,name.toString()+"(姹囨��)");
+ QTreeWidgetItem *top2 = new QTreeWidgetItem(top1);
+ top2->setText(0,name.toString()+"(鏈骇)");
+ }
+
+ }
+
+
+ }
+ wbs->dynamicCall("Close()");
+ excel.dynamicCall("Quit(void)");
+
+ qDebug()<<"鍗曚綅淇℃伅鏁伴噺锛�"<<m_nameAndComInfos.size();
+}
+
+void ConverInfo2::on_pushButton_laodFile_clicked()
+{
+ QString path = QFileDialog::getOpenFileName(this,"閫夋嫨琛ㄦ牸:鍗曚綅鍙婂唴閮ㄥ璁℃満鏋勫熀鏈儏鍐佃〃","./","excel(*鍩烘湰鎯呭喌琛�*.xls)");
+ qDebug()<<"path:"<<path;
+ if(path.size() > 1){
+ readExcelFromPath(path);
+ }
}
diff --git a/internal_system_v1/converinfo2.h b/internal_system_v1/converinfo2.h
index 96c6384..40beb59 100644
--- a/internal_system_v1/converinfo2.h
+++ b/internal_system_v1/converinfo2.h
@@ -22,6 +22,8 @@
void initUi();
void readInfo();
void addMenu();
+ void readExcelFromPath(QString path);
+
private slots:
void showMenu(QPoint p);
void addInfo();
diff --git a/internal_system_v1/converinfo2.ui b/internal_system_v1/converinfo2.ui
index 51e9fc7..f9dc8d7 100644
--- a/internal_system_v1/converinfo2.ui
+++ b/internal_system_v1/converinfo2.ui
@@ -19,7 +19,7 @@
<widget class="QTreeWidget" name="treeWidget">
<property name="maximumSize">
<size>
- <width>300</width>
+ <width>500</width>
<height>16777215</height>
</size>
</property>
@@ -38,7 +38,7 @@
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
- <x>-115</x>
+ <x>0</x>
<y>0</y>
<width>1100</width>
<height>1600</height>
diff --git a/internal_system_v1/internal_system_v1.pro.user b/internal_system_v1/internal_system_v1.pro.user
index 7390a27..d92cbd0 100644
--- a/internal_system_v1/internal_system_v1.pro.user
+++ b/internal_system_v1/internal_system_v1.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2024-04-20T19:27:31. -->
+<!-- Written by QtCreator 4.5.0, 2024-05-13T00:49:29. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
--
Gitblit v1.8.0