合并新订单详情和新主界面代码

takeout/view/newmainform.cpp

@@ -236,11 +236,11 @@ NewMainForm::NewMainForm(QWidget *parent) :
 
     _alertForm = new AlertForm(this);
     _padForm = new PadForm(this);
-    _detailForm = new DetailForm(this);
+    _detailForm = new NewDetailForm(this);
 
     connect(ui->newmaintablewidget_order, &QTableWidget::itemClicked, this, &NewMainForm::onMainTableItemClicked);
 
-    connect(_detailForm, &DetailForm::showAlert, this, &NewMainForm::onShowAlert);
+    connect(_detailForm, &NewDetailForm::showAlert, this, &NewMainForm::onShowAlert);
     _padForm->move(this->pos().x() + 212 ,this->pos().y() + 100);
     _padForm->hide();
     connect(_padForm, &PadForm::numClicked, this, &NewMainForm::onNumClicked);

takeout/view/newmainform.h

@@ -19,7 +19,7 @@
 #include "view/alertForm.h"
 #include "view/sysTray.h"
 #include "view/padForm.h"
-#include "view/detailForm.h"
+#include "view/newdetailform.h"
 
 
 #define MAIN_ORDER  "order"
@@ -147,7 +147,7 @@ private:
     // 搜索结果窗口
     QListWidget *_resultForm;
     // 订单详情页面
-    DetailForm *_detailForm;
+    NewDetailForm *_detailForm;
 private:
     void InitOrderWidget(QString type);
     void InitSetWidget();