com

fmTakeaway/Control/flowControl.cpp

@@ -997,6 +997,7 @@ void FlowControl::onRefund(const QString &orderId, const QString &reason)
 
 void FlowControl::onPullDishes()
 {
+    qDebug() << __FUNCTION__;
     QString error;
     bool result;
     QJsonObject sendJson;

fmTakeaway/detailForm.cpp

@@ -58,7 +58,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票");
     ui->detailLab9->setText(QString("-")+Penny2Dollar(orderObject->dis_shop_fee));
     ui->detailLab10->setText(QString("-")+Penny2Dollar(orderObject->service_fee));
-    ui->detailLab11->setText(QString("-")+Penny2Dollar(orderObject->dis_shop_fee+orderObject->service_fee));
+    ui->detailLab11->setText(Penny2Dollar(orderObject->shop_fee-orderObject->dis_shop_fee-orderObject->service_fee));
     int pricecount=0;
     for(int i=0; i<orderObject->proList.count(); i++)
     {

fmTakeaway/detailForm.ui

@@ -988,7 +988,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>优惠合计:</string>
+                <string>预计收入:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>

fmTakeaway/mainForm.cpp

@@ -41,8 +41,6 @@ MainForm::MainForm(QWidget *parent) :
     connect(this, &MainForm::processOrder, &FlowControl::GetInstance(), &FlowControl::onProcessOrder);
     connect(this, &MainForm::getOnDutyCashiers, &FlowControl::GetInstance(), &FlowControl::onGetOnDutyCashiers);
     connect(this, &MainForm::getOrderDetails, &FlowControl::GetInstance(), &FlowControl::onGetOrderDetails);
-    connect(this, &MainForm::PullDishes, &FlowControl::GetInstance(), &FlowControl::onPullDishes);
-    connect(this, &MainForm::GetBusinessStatus, &FlowControl::GetInstance(), &FlowControl::onGetBusinessStatus);
     connect(&FlowControl::GetInstance(), &FlowControl::hideAlert, this, &MainForm::onHideAlert);
     connect(&FlowControl::GetInstance(), &FlowControl::showAlert, this, &MainForm::onShowAlert);
     connect(&FlowControl::GetInstance(), &FlowControl::setOpeStatus, this, &MainForm::onSetOpeStatus);
@@ -98,12 +96,17 @@ void MainForm::MyShow()
     m_resultForm->hide();
     connect(m_resultForm, &QListWidget::itemClicked, this, &MainForm::onSearchResultItemClicked);
 
+    // 菜品管理门店管理
     m_dishesForm = new dishesForm(this);
-
+    //ui->mainBtnMDGL->hide();
     m_bunisStatusForm = new BStatusForm(this);
-
+    //ui->mainBtnDc->hide();
     emit flowStart();
 
+    connect(this, &MainForm::PullDishes, &FlowControl::GetInstance(), &FlowControl::onPullDishes);
+    connect(this, &MainForm::GetBusinessStatus, &FlowControl::GetInstance(), &FlowControl::onGetBusinessStatus);
+
+
     ui->mainEdtSearch->setFocus();
     return;
 }
@@ -120,7 +123,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.3.4");
+    ui->mainLabVersion->setText("1.3.7");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表
@@ -523,6 +526,7 @@ void MainForm::onSearchResultItemClicked(QListWidgetItem *item)
 
 void MainForm::on_mainBtnDc_clicked()
 {
+    qDebug() << __FUNCTION__;
     emit PullDishes();
 }