1.主界面调整对接订单详情界面准备

Resources/skin/deaufult.qrc

@@ -37,5 +37,6 @@
 		<file>setting_off.png</file>
 		<file>setting_on.png</file>
 		<file>mainlogo.png</file>
+		<file>newmainhide.png</file>
     </qresource>
 </RCC>
\ No newline at end of file

takeout/main.cpp

@@ -174,8 +174,11 @@ int main(int argc, char *argv[])
     mainform.MyShow();
     loginform.showfull();
 #else
+    LoginForm loginform;
     NewMainForm mainform;
-    mainform.FullShow();
+    FloatForm floatform;
+    mainform.MyShow();
+    loginform.showfull();
 #endif
     //回归事件循环
     return a.exec();

takeout/takeout.pro

@@ -26,7 +26,7 @@ DEFINES += FM_NEW_UI
 
 #DEFINES += FM_TEST
 #DEFINES += FM_MAIN_TEST
-DEFINES += FM_ORDER_TEST
+#DEFINES += FM_ORDER_TEST
 RC_FILE += takeout.rc
 
 CONFIG += c++11

takeout/view/alertForm.h

@@ -24,6 +24,8 @@ public:
         LOADING
     }Type;
 
+
+
     /* 功能:设置显示内容
      * 参数:[1]窗体类型[2]信息内容
      * 返回:NULL

takeout/view/mainbtn.cpp

@@ -33,6 +33,7 @@ void MainBtn::setChecked(bool check)
 
             ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(255,255,255,1)}");
             ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:orders_on.png)}");
+            _info = QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE7\xAE\xA1\xE7\x90\x86");
         }
         else
         {
@@ -48,6 +49,7 @@ void MainBtn::setChecked(bool check)
         {
             ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(255,255,255,1)}");
             ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:refund_on.png)}");
+            _info = QString::fromUtf8("\xE9\x80\x80\xE5\x8D\x95");
         }
         else
         {
@@ -57,12 +59,13 @@ void MainBtn::setChecked(bool check)
         return ;
     }
 
-    if(type.compare("set",Qt::CaseInsensitive) == 0)
+    if(type.compare("set",Qt::CaseInsensitive) == 0);
     {
         if(check)
         {
             ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(255,255,255,1)}");
             ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:setting_on.png)}");
+            _info = QString::fromUtf8("\xE8\xAE\xBE\xE7\xBD\xAE");
         }
         else
         {
@@ -108,3 +111,8 @@ void MainBtn::SetText(QString data, QString type)
         return ;
     }
 }
+
+QString MainBtn::info() const
+{
+    return _info;
+}

takeout/view/mainbtn.h

@@ -21,6 +21,8 @@ public:
 
     void SetText(QString data, QString type);
 
+    QString info() const;
+
 signals:
     void clicked();
 private:
@@ -29,6 +31,8 @@ private:
     bool _checked;
 
     QString _type;
+
+    QString _info;
 };
 
 #endif // MAINBTN_H

takeout/view/newmainform.h

@@ -10,10 +10,17 @@
 #include <QMap>
 #include <QVector>
 #include <QVariantMap>
+#include <QListWidget>
+#include <QTableWidgetItem>
 
 #include "preDefine.h"
 #include "model/posorderpool.h"
 #include "view/mainbtn.h"
+#include "view/alertForm.h"
+#include "view/sysTray.h"
+#include "view/padForm.h"
+#include "view/detailForm.h"
+
 
 #define MAIN_ORDER  "order"
 #define MAIN_REFUND "refund"
@@ -59,6 +66,17 @@ public:
     bool event(QEvent *e);
 
     void FullShow();
+
+    void MyShow();
+public slots:
+    void OptOrder(QString orderid, QString optname);
+    void onSetCurrentTime();
+    void onSerachclicked();
+    void onNumClicked(const QString &num);
+    void onNumDelete();
+    void onSearchResultItemClicked(QListWidgetItem *item);
+    void onMainTableItemClicked(QTableWidgetItem *item);
+    void onSerachOrder(const QString &key);
 private slots:
     void on_newmainbtn_clicked();
 
@@ -84,10 +102,12 @@ private slots:
 
     void on_newmainbtn_up_clicked();
 
-    void on_newmainbtn_close_clicked();
-
     void on_newmainbtn_jump_clicked();
 
+    void on_newmainbtn_hide_clicked();
+
+    void on_newmainbtn_findclean_clicked();
+
 private:
     Ui::NewMainForm *ui;
     //
@@ -114,8 +134,20 @@ private:
     int _curr_page_num;
     //当前页数
     int _curr_page;
-
-
+    // 通知窗口
+    AlertForm *_alertForm;
+    // 时间定时器
+    QTimer _timeTimer;
+    // 置顶计数器
+    int _raiseIndex;
+    // 托盘图标
+    SysTray m_tray;
+    // 数字键盘窗口
+    PadForm *_padForm;
+    // 搜索结果窗口
+    QListWidget *_resultForm;
+    // 订单详情页面
+    DetailForm *_detailForm;
 private:
     void InitOrderWidget(QString type);
     void InitSetWidget();
@@ -150,6 +182,11 @@ private:
     void InitMainBtn();
     void SetMainBtnCheck(MainBtn *wgt);
     void ClassifyOrderWithOrderType();
+    void onShowAlert(AlertForm::Type type, const QString &msg);
+    void onSetStoreInfo(const QString &storeId);
+    void onSetCashierInfo(const QString &cashierInfo);
+    void onSetNetStatus(const QString &netstatus);
+    void onHideAlert();
 };
 
 class NewMainFormDataProcess

takeout/view/orderoptform.cpp

 #include "orderoptform.h"
 #include "ui_orderoptform.h"
+#include "model/posorderpool.h"
+#include "preDefine.h"
 
 OrderOptForm::OrderOptForm(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::OrderOptForm)
 {
     ui->setupUi(this);
+
+    _is_valid = false;
+}
+
+int OrderOptForm::GetOrderStatus(int order_status, int refund_status)
+{
+    if(refund_status == ApplicationRefundOrder ||
+            refund_status == ApplicationPartialRefundOrder ||
+           refund_status == CompleteRefundOrder ||
+            refund_status == ApprovalRefundOrder)
+        return refund_status;
+    else
+        return order_status;
+}
+
+QString OrderOptForm::opt() const
+{
+    return _opt;
+}
+
+QString OrderOptForm::order_id() const
+{
+    return _order_id;
+}
+
+int OrderOptForm::order_type() const
+{
+    return _order_type;
+}
+
+void OrderOptForm::InitShow(QString order_id, int order_status, int refund_status, int order_type)
+{
+    _order_id = order_id;
+    _order_type = order_type;
+
+    int status = GetOrderStatus(order_status, refund_status);
+
+    QString name;
+
+    _is_valid = getOrderOptAndName(status, order_type, _opt, name);
+
+    if(!_is_valid)
+    {
+         ui->btn_orderopt->hide();
+    }
+    else
+    {
+        ui->btn_orderopt->setText(name);
+    }
+}
+
+bool OrderOptForm::getOrderOptAndName(int status, int order_type, QString &optname, QString &name)
+{
+    switch (status) {
+    case NewOrder:
+        optname = OPERATION_GETDELIVERS;
+        name = QString::fromUtf8("\xE5\x88\xB6\xE4\xBD\x9C");
+        ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgba(25, 166, 119);border:1px solid rgb(25, 166, 119); }");
+        return true;
+    case FirmOrder:
+        if(order_type == TimelyTakeout || order_type == AppointmentTakeout)
+        {
+            optname =  OPERATION_SENDOUT;
+            name = QString::fromUtf8("\xE9\x80\x81\xE5\x87\xBA");
+        }
+        else
+        {
+            optname = OPERATION_MAKEOVER;
+            name = QString::fromUtf8("\xE5\x81\x9A\xE5\xAE\x8C");
+        }
+        ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgb(25, 108, 166);border:1px solid rgb(25, 108, 166); }");
+        return true;
+    case CancelOrder:
+        return false;
+    case DispatchingOrder:
+        optname = OPERATION_COMPLETE;
+        name = QString::fromUtf8("\xE5\xAE\x8C\xE6\x88\x90");
+        ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgb(236, 67, 56);border:1px solid rgb(236, 67, 56); }");
+        return true;
+    case InDevelopment:
+        optname = OPERATION_COMPLETE;
+        name = QString::fromUtf8("\xE5\xAE\x8C\xE6\x88\x90");
+        ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgb(236, 67, 56);border:1px solid rgb(236, 67, 56); }");
+        return true;
+    case ServiceOrder:
+    case CompleteOrder:
+        return false;
+    case ApplicationRefundOrder:
+    case ApplicationPartialRefundOrder:
+        optname = OPERATION_REFUNDORDER;
+        name = QString::fromUtf8("\xE5\x90\x8C\xE6\x84\x8F");
+        ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgb(25, 166, 119);border:1px solid rgb(25, 166, 119); }");
+        return true;
+    default:
+        return false;
+    }
 }
 
 OrderOptForm::~OrderOptForm()
 {
     delete ui;
 }
+
+void OrderOptForm::on_btn_orderopt_clicked()
+{
+    emit OptOrder(_order_id, _opt);
+}

takeout/view/orderoptform.h

@@ -14,9 +14,31 @@ class OrderOptForm : public QWidget
 public:
     explicit OrderOptForm(QWidget *parent = 0);
     ~OrderOptForm();
+    void InitShow(QString order_id, int order_status, int refund_status, int order_type);
+    int GetOrderStatus(int order_status, int refund_status);
+    QString opt() const;
+
+    QString order_id() const;
+
+    int order_type() const;
+    bool getOrderOptAndName(int status, int order_type, QString &optname, QString &name);
+
+signals:
+    void OptOrder(QString order_id, QString opt_name);
+
+private slots:
+    void on_btn_orderopt_clicked();
 
 private:
     Ui::OrderOptForm *ui;
+
+    QString _opt;
+
+    QString _order_id;
+
+    int _order_type;
+
+    bool _is_valid;
 };
 
 #endif // ORDEROPTFORM_H

takeout/view/orderoptform.ui

@@ -19,20 +19,12 @@
 	
 	background-color: rgb(255, 255, 255);
 }
-#btn_orderinfo
-{
-	width:48px;
-	height:20px;
-	border:1px solid rgba(230,230,230,1);	
-	border-radius:4px;
-}
 #btn_orderopt
 {
 	width:48px;
 	height:20px;
-	background:rgba(25,166,119,1);
-	border:1px solid rgba(25,166,119,1);
 	border-radius:4px;
+	color:rgba(255,255,255,1);
 }</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
@@ -84,41 +76,6 @@
     </widget>
    </item>
    <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>2</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QPushButton" name="btn_orderinfo">
-     <property name="minimumSize">
-      <size>
-       <width>50</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>50</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>详情</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

takeout/view/ordertypeform.cpp

@@ -78,11 +78,6 @@ void OrderTypeForm::SetNameStyle(int status)
     }
 }
 
-void OrderTypeForm::on_orderstatus_changed(int order_status, int refund_status)
-{
-
-}
-
 int OrderTypeForm::order_type() const
 {
     return _order_type;

takeout/view/ordertypeform.h

@@ -30,9 +30,6 @@ public:
     int order_type() const;
 
     void SetNameStyle(int status);
-
-public slots:
-    void on_orderstatus_changed(int order_status, int refund_status);
 private:
     Ui::OrderTypeForm *ui;
     QString _order_id;