fix bug: 退单原因码 有int -> QString

         tab表页界面显示优化

fmTakeout/DTools/dataManger.cpp

@@ -149,7 +149,7 @@ QJsonObject DataManger::GetRefundOrderData(int reasonCode,const QString &reason,
     }
     rObj.insert(JSON_ORDERID, orderId);
     rObj.insert("productIds", productIds);
-    rObj.insert("canceledCause", reasonCode);
+    rObj.insert("canceledCause", QString::number(reasonCode, 10) );
     rObj.insert(JSON_POSIPADDRESS,QString("http://") + m_posIpAddress);
 
     return rObj;

fmTakeout/mainForm.cpp

@@ -414,9 +414,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
     table->setItem(0, 5, item5);  // 下单时间
     if(table != ui->mainTableFinsh)
     {
-        // 订单已经支付待接单的订单 + 已经接单的订单 + 已经配送的订单;
-        if(OrderObject::NewOrder==orderObject->orderStatus || OrderObject::Confirmed==orderObject->orderStatus
-                 || OrderObject::Sendout==orderObject->orderStatus )
+        // 订单已经支付待接单的订单;
+        if(OrderObject::NewOrder==orderObject->orderStatus)
         {
             qDebug()<<table->objectName()<<"------";
             QWidget *pWdg = new QWidget(table);
@@ -434,6 +433,48 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
             table->setCellWidget(0, 6, pWdg);   // 操作按钮
             connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
         }
+
+        //已经接单的订单;
+        if(OrderObject::Confirmed==orderObject->orderStatus )
+        {
+            qDebug()<<table->objectName()<<"------";
+            QWidget *pWdg = new QWidget(table);
+            QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
+            QPushButton * pBtn = new QPushButton(pWdg);
+            pBtn->setFixedSize(90, 30);
+            pBtn->setFocusPolicy(Qt::NoFocus);
+            pBtn->setObjectName("mainProcBtn");
+            pBtn->setProperty("orderId", orderObject->id);
+            //pBtn->setProperty("operation", table->property("operation").toString());
+            pBtn->setText(QString::fromLocal8Bit("请扫码配送"));
+            pBtn->setDisabled(true);
+            hLayout->addWidget(pBtn);
+            hLayout->setMargin(0);
+            pWdg->setLayout(hLayout);
+            table->setCellWidget(0, 6, pWdg);   // 操作按钮
+            //connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
+        }
+
+        // 已经配送的订单不能点击完成;
+        if(OrderObject::Sendout==orderObject->orderStatus )
+        {
+            qDebug()<<table->objectName()<<"------";
+            QWidget *pWdg = new QWidget(table);
+            QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
+            QPushButton * pBtn = new QPushButton(pWdg);
+            pBtn->setFixedSize(90, 30);
+            pBtn->setFocusPolicy(Qt::NoFocus);
+            pBtn->setObjectName("mainProcBtn");
+            pBtn->setProperty("orderId", orderObject->id);
+            //pBtn->setProperty("operation", table->property("operation").toString());
+            pBtn->setText(QString::fromLocal8Bit("等待配送完成"));
+            pBtn->setDisabled(true);
+            hLayout->addWidget(pBtn);
+            hLayout->setMargin(0);
+            pWdg->setLayout(hLayout);
+            table->setCellWidget(0, 6, pWdg);   // 操作按钮
+            //connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
+        }
         // 已经取消的订单 + 商家已经退款的订单;
         if(OrderObject::Refunded == orderObject->orderStatus)
         {