diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index d8f6dd6..731fdee 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -51,7 +51,8 @@ } //chooseDevices(programInfo.standard_device_id,programInfo.verification_documents_id); selectStandard(""); - selectBizDevice(""); + QStringList list; + selectBizDevice(list); } } @@ -167,12 +168,13 @@ } } -void NewVerifyMethod::selectBizDevice(QString ids){ - if(ids!=""){ +void NewVerifyMethod::selectBizDevice(QList ids){ + if(ids.count()>2){ + QString bizIds=ids[2]; if( programInfo.verification_documents_id=="") - programInfo.verification_documents_id = ids; + programInfo.verification_documents_id = bizIds; else - programInfo.verification_documents_id =QString("%1,%2").arg(programInfo.verification_documents_id).arg(ids); + programInfo.verification_documents_id =QString("%1,%2").arg(programInfo.verification_documents_id).arg(bizIds); } ui->tableWidget_2->clearContents(); ui->tableWidget_2->setRowCount(0); @@ -461,7 +463,7 @@ FormBizDeviceSelect *checkWindow = new FormBizDeviceSelect; //checkWindow->newVerifyWnd=this; checkWindow->setWindowState(Qt::WindowMaximized); - connect(checkWindow, SIGNAL(selectBizDevice(QString)), this,SLOT(selectBizDevice(QString))); + connect(checkWindow, SIGNAL(selectBizDevice(QList)), this,SLOT(selectBizDevice(QList))); checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index d8f6dd6..731fdee 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -51,7 +51,8 @@ } //chooseDevices(programInfo.standard_device_id,programInfo.verification_documents_id); selectStandard(""); - selectBizDevice(""); + QStringList list; + selectBizDevice(list); } } @@ -167,12 +168,13 @@ } } -void NewVerifyMethod::selectBizDevice(QString ids){ - if(ids!=""){ +void NewVerifyMethod::selectBizDevice(QList ids){ + if(ids.count()>2){ + QString bizIds=ids[2]; if( programInfo.verification_documents_id=="") - programInfo.verification_documents_id = ids; + programInfo.verification_documents_id = bizIds; else - programInfo.verification_documents_id =QString("%1,%2").arg(programInfo.verification_documents_id).arg(ids); + programInfo.verification_documents_id =QString("%1,%2").arg(programInfo.verification_documents_id).arg(bizIds); } ui->tableWidget_2->clearContents(); ui->tableWidget_2->setRowCount(0); @@ -461,7 +463,7 @@ FormBizDeviceSelect *checkWindow = new FormBizDeviceSelect; //checkWindow->newVerifyWnd=this; checkWindow->setWindowState(Qt::WindowMaximized); - connect(checkWindow, SIGNAL(selectBizDevice(QString)), this,SLOT(selectBizDevice(QString))); + connect(checkWindow, SIGNAL(selectBizDevice(QList)), this,SLOT(selectBizDevice(QList))); checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 8e03f4e..8f62d30 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -33,7 +33,7 @@ void on_comboBoxEquipment_currentIndexChanged(int index); void selectStandard(QString ids); - void selectBizDevice(QString ids); + void selectBizDevice(QList ids); void on_pushButton_clicked();