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.cpp

-#include "newmainform.h"
+#include "newmainform.h"
 #include "ui_newmainform.h"
 #include "model/orderObject.h"
 #include "model/posorderpool.h"
@@ -10,8 +10,8 @@
 
 #include "event/fmapplication.h"
 #include "event/posevent.h"
+#include "QsLog.h"
 
-#include <QDebug>
 #include <QScrollBar>
 
 NewMainForm::NewMainForm(QWidget *parent) :
@@ -226,12 +226,136 @@ NewMainForm::NewMainForm(QWidget *parent) :
     FMApplication::subscibeEvent(this, PosEvent::s_show_mainform);
     FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
 
-    this->show();
+    //this->show();
+    this->showFullScreen();
+    this->hide();
+
+    this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+
+    connect(ui->newmainline_serach, &ClickedLineEdit::clicked, this, &NewMainForm::onSerachclicked);
+
+    _alertForm = new AlertForm(this);
+    _padForm = new PadForm(this);
+    _detailForm = new DetailForm(this);
+
+    connect(ui->newmaintablewidget_order, &QTableWidget::itemClicked, this, &NewMainForm::onMainTableItemClicked);
+
+    connect(_detailForm, &DetailForm::showAlert, this, &NewMainForm::onShowAlert);
+    _padForm->move(this->pos().x() + 212 ,this->pos().y() + 100);
+    _padForm->hide();
+    connect(_padForm, &PadForm::numClicked, this, &NewMainForm::onNumClicked);
+    connect(_padForm, &PadForm::numDelete, this, &NewMainForm::onNumDelete);
+    connect(_padForm, &PadForm::numClear, ui->newmainline_serach, &ClickedLineEdit::clear);
+    _resultForm = new QListWidget(this);
+    _resultForm->setObjectName("mainListWdg0");
+    _resultForm->setFixedSize(340, 200);
+    _resultForm->move(454, 100);
+    _resultForm->hide();
+    connect(_resultForm, &QListWidget::itemClicked, this, &NewMainForm::onSearchResultItemClicked);
+
+    connect(&_timeTimer, &QTimer::timeout, this, &NewMainForm::onSetCurrentTime);
+
+    connect(ui->newmainline_serach, &ClickedLineEdit::textChanged, this, &NewMainForm::onSerachOrder);
+
+    _raiseIndex = 0;
+
+    _timeTimer.start(1000);
+
+    // 显示托盘
+    m_tray.show();
+}
+
+void NewMainForm::onSerachOrder(const QString &key)
+{
+    if(key.isEmpty())
+    {
+        _resultForm->hide();
+        return;
+    }
+
+    QMap<QString, QString> map;
+
+    _resultForm->clear();
+    if(PosOrderPool::GetSearchOrder(key, map))
+    {
+        QMap<QString,QString>::const_iterator order;
+        for(order=map.begin(); order!=map.end(); order++)
+        {
+            QListWidgetItem* item=new QListWidgetItem();
+            item->setText(QString::fromLocal8Bit("订单号:") + order.key() + QString::fromLocal8Bit("  手机号:") + order.value());
+            _resultForm->addItem(item);
+        }
+        _resultForm->show();
+    }
+}
+
+void NewMainForm::onSearchResultItemClicked(QListWidgetItem *item)
+{
+    ui->newmainline_serach->clear();
+    _padForm->hide();
+    _resultForm->hide();
+    QString str=item->text();
+
+    QLOG_DEBUG() << "mainForm input 0" << str;
+
+    str=str.mid(4);
+
+    QLOG_DEBUG() << "mainForm input 1" << str;
+
+    QString y = "  ";
+    str=str.mid(0,str.indexOf(y));
+
+    QLOG_DEBUG() << "mainForm input 2" << str;
+
+    OrderObject order;
+    if(!PosOrderPool::GetOrderObject(str, order))
+        return ;
+
+    onHideAlert();
+    _detailForm->InitData(&order);
+    _detailForm->show();
+}
+
+void NewMainForm::onNumClicked(const QString &num)
+{
+    ui->newmainline_serach->setText(ui->newmainline_serach->text().append(num));
+}
+
+void NewMainForm::onNumDelete()
+{
+    QString text = ui->newmainline_serach->text();
+    ui->newmainline_serach->setText(text.left(text.length()-1));
+}
+
+void NewMainForm::onSerachclicked()
+{
+    _padForm->show();
+}
+
+void NewMainForm::onSetCurrentTime()
+{
+    if(_raiseIndex++>10)
+    {
+       _raiseIndex=0;
+       raise();
+    }
+    ui->newmainlabel_time->setText(QDateTime::currentDateTime().toString(QString("MM-dd hh:mm:ss")));
+}
+
+void NewMainForm::onShowAlert(AlertForm::Type type, const QString &msg)
+{
+
+    if(this->isVisible())
+    {
+        _alertForm->SetContent(type, msg);
+        _alertForm->show();
+    }
 }
 
 void NewMainForm::FullShow()
 {
-    this->show();
+    //this->show();
+    this->showFullScreen();
     InitPageNum();
 }
 
@@ -244,8 +368,6 @@ void NewMainForm::InitPageNum()
     if(_curr_page_num %(num - 1) != 0)
         ++ page;
 
-    //qDebug() << "+++++++" << num << ";" << "page" << page << ";" << _curr_page_num;
-
     _curr_page = 1;
     ui->newmaintablewidget_order->verticalScrollBar()->setValue(0);
     ui->newmainlabel_allnum->setText(QString::fromUtf8("\xE5\x85\xB1%1\xE6\x9D\xA1").arg(QString::number(_curr_page_num)));
@@ -477,6 +599,7 @@ void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
             break;
         }
     }
+    ui->newmainlabel_allnum->setText(QString::fromUtf8("\xE5\x85\xB1%1\xE6\x9D\xA1").arg(QString::number(_curr_page_num)));
 }
 
 void NewMainForm::InitMainBtn()
@@ -572,6 +695,7 @@ bool NewMainForm::event(QEvent *e)
 
     if(e->type() == PosEvent::s_show_mainform)
     {
+        //this->show();
         this->showFullScreen();
         return true;
     }
@@ -590,9 +714,121 @@ bool NewMainForm::event(QEvent *e)
         }
         return true;
     }
+
+    if(e->type() == PosEvent::s_opt_status)
+    {
+        QVariantMap value;
+
+        GETEVENTINFO(value,e,QVariantMap);
+
+        if(value.contains(EVENT_KEY_ORDERSTATUS) && value[EVENT_KEY_ORDERSTATUS].toInt() == 0)
+        {
+            if(!this->isHidden())
+                onShowAlert(AlertForm::LOADING, value[EVENT_KEY_MSG].toString());
+            return true;
+        }
+
+        if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
+        {
+            QLOG_INFO() << value[EVENT_KEY_MSG].toString();
+            if(!this->isHidden())
+                onShowAlert((AlertForm::Type)1, value[EVENT_KEY_MSG].toString());
+        }
+        else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
+        {
+            if(!this->isHidden())
+                onShowAlert(AlertForm::SUCCESS, value[EVENT_KEY_MSG].toString());
+        }
+        return true;
+    }
+
+    if(e->type() == PosEvent::s_login_status)
+    {
+        QVariantMap value;
+
+        GETEVENTINFO(value,e,QVariantMap);
+
+        if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
+        {
+            QLOG_INFO() << value[EVENT_KEY_MSG].toString();
+            onSetStoreInfo(QString::fromUtf8("\xE6\x9C\xAA\xE7\x99\xBB\xE5\xBD\x95"));
+            onSetCashierInfo(QString::fromUtf8("\xE6\x9C\xAA\xE7\x99\xBB\xE5\xBD\x95"));
+        }
+        else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
+        {
+            onSetStoreInfo(_storeinfo[JSON_STOREID].toString());
+            onSetCashierInfo(_storeinfo[JSON_STATIONID].toString());
+            onSetNetStatus(QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE6\xAD\xA3\xE5\xB8\xB8"));
+        }
+        return true;
+    }
+
+    if(e->type() == PosEvent::s_network_outtime)
+    {
+        QVariantMap value;
+        GETEVENTINFO(value,e,QVariantMap);
+        if(value.contains(EVENT_KEY_NETWORKSTATUS) && value[EVENT_KEY_NETWORKSTATUS].toBool() == true)
+        {
+            onSetNetStatus(QString::fromUtf8(""));
+        }else{
+            QLOG_INFO() << "STATIC: EVENT_KEY_NETWORKSTATUS:false";
+            onSetNetStatus(QString("<font color='#ff0000'>%1</font>").arg(QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE5\xBC\x82\xE5\xB8\xB8")));
+            onShowAlert((AlertForm::Type)1, QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE5\xBC\x82\xE5\xB8\xB8\x2C\xE8\xAF\xB7\xE6\xA3\x80\xE6\x9F\xA5\xE7\xBD\x91\xE7\xBB\x9C\xE9\x93\xBE\xE6\x8E\xA5\x21"));
+        }
+        return true;
+    }
+
     return QWidget::event(e);
 }
 
+void NewMainForm::onSetNetStatus(const QString &netstatus)
+{
+    ui->newmainlabel_net->setText(netstatus);
+}
+
+void NewMainForm::onMainTableItemClicked(QTableWidgetItem *item)
+{
+    QTableWidget *table = ui->newmaintablewidget_order;
+
+    OrderTypeForm* pwd = (OrderTypeForm *)table->cellWidget(item->row(), 1);
+
+    QString orderId = pwd->order_id();
+
+    OrderObject order;
+
+    if(!PosOrderPool::GetOrderObject(orderId, order))
+        return ;
+
+    onHideAlert();
+    _detailForm->InitData(&order);
+    _detailForm->show();
+
+}
+
+void NewMainForm::onHideAlert()
+{
+    _alertForm->hide();
+}
+
+
+void NewMainForm::onSetCashierInfo(const QString &cashierInfo)
+{
+    QString posno = QString::fromUtf8("\xE6\x94\xB6\xE9\x93\xB6\x3A%1").arg(cashierInfo);
+
+    QLOG_DEBUG() << posno << cashierInfo;
+
+    ui->newmainlabel_posid->setText(posno);
+}
+
+void NewMainForm::onSetStoreInfo(const QString &storeId)
+{
+    QString store_id = QString::fromUtf8("\xE9\x97\xA8\xE5\xBA\x97\x3A%1").arg(storeId);;
+
+    QLOG_DEBUG() << store_id << storeId;
+
+    ui->newmainlabel_store->setText(store_id);
+}
+
 void NewMainForm::SetChecked(QPushButton *btn)
 {
     foreach (auto var, _classify_set) {
@@ -619,10 +855,12 @@ void NewMainForm::UpdateTableWidget(OrderObject &orderObject)
     for(int i=0; i<table->rowCount(); i++)
     {
         OrderTypeForm *pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+        OrderOptForm *opt = (OrderOptForm *)table->cellWidget(i, 6);
 
         if(orderObject.order_id.compare(pwd->order_id()) == 0)
         {
             pwd->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
+            opt->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
             break;
         }
     }
@@ -647,6 +885,25 @@ void NewMainForm::DeleteTableWidget(QString orderid)
     ClassifyOrder(_curr_check_btn->property("type").toString());
 }
 
+void NewMainForm::MyShow()
+{
+    this->FullShow();
+    this->hide();
+}
+
+void NewMainForm::OptOrder(QString orderid, QString optname)
+{
+    QLOG_DEBUG() << "orderid:" << orderid << "optname:" <<  optname;
+
+    QVariantMap value;
+
+    value.insert(EVENT_KEY_ORDERID, orderid);
+    value.insert(EVENT_KEY_STATUS, optname);
+
+    POSTEVENTTYPE(PosEvent::s_opt_order,value,QVariantMap);
+}
+
+
 void NewMainForm::InitTableWidget()
 {
     ui->newmaintablewidget_order->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
@@ -659,14 +916,15 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
     QTableWidget *table = ui->newmaintablewidget_order;
     table->insertRow(0);
     QTableWidgetItem *item = new QTableWidgetItem(QString::number(orderObject.order_index));
-
+    item->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 0, item);  //序号
+
     OrderTypeForm *pWdg = new OrderTypeForm(table);
     pWdg->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
     //pWdg->InitShow(QString::number(orderObject.order_index), orderObject.status, orderObject.refund_status, orderObject.order_type);
 
     table->setCellWidget(0, 1, pWdg); //订单状态
-    QTableWidgetItem *item0 = new QTableWidgetItem(QString::number(orderObject.order_index));
+    QTableWidgetItem *item0 = new QTableWidgetItem(QString(orderObject.channel_name));
     item0->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 2, item0);  // 渠道
 //    QTableWidgetItem *item1 = new QTableWidgetItem(orderObject.order_id);
@@ -686,7 +944,9 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
 //    table->setItem(0, 6, item5);  // 下单时间
 
     OrderOptForm *form = new OrderOptForm(table);
+    form->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
     table->setCellWidget(0, 6, form); //订单操作
+    connect(form, &OrderOptForm::OptOrder, this, &NewMainForm::OptOrder);
 
     //qDebug() << _curr_check_btn->property("type").toString();
 
@@ -778,6 +1038,7 @@ void NewMainForm::on_newmainbtn_clicked()
     if(!type.isEmpty())
     {
         InitWidget(type);
+        ui->newmainlabel_mgtitile->setText(pBtn->info());
     }
 }
 
@@ -1152,11 +1413,6 @@ void NewMainForm::on_newmainbtn_up_clicked()
     }
 }
 
-void NewMainForm::on_newmainbtn_close_clicked()
-{
-    FMApplication::exit(0);
-}
-
 void NewMainForm::on_newmainbtn_jump_clicked()
 {
     int num = ui->newmaintablewidget_order->height()/36;
@@ -1182,3 +1438,18 @@ void NewMainForm::on_newmainbtn_jump_clicked()
         ui->newmainlabel_page->setText(QString::number(_curr_page)+ "/" + QString::number(tmppage));
     }
 }
+
+void NewMainForm::on_newmainbtn_hide_clicked()
+{
+    hide();
+    ui->newmainline_serach->clear();
+    _padForm->hide();
+    DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
+}
+
+void NewMainForm::on_newmainbtn_findclean_clicked()
+{
+    _padForm->hide();
+    _resultForm->hide();
+    ui->newmainline_serach->setText("");
+}

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/newmainform.ui

@@ -55,15 +55,11 @@
 }
 #newmainbtn_needrefund,#newmainbtn_refunded,#newmainbtn_all,#newmainbtn_new,#newmainbtn_make,#newmainbtn_makeover,#newmainbtn_over,#newmainbtn_future,#newmainbtn_send
 {
-	width:100px;
-	height:30px;
 	border:1px solid rgba(230,230,230,1);
 	font: 75 14px "微软雅黑";
 }
 #newmainbtn_needrefund:checked,#newmainbtn_refunded:checked,#newmainbtn_all:checked,#newmainbtn_new:checked,#newmainbtn_make:checked,#newmainbtn_makeover:checked,#newmainbtn_future:checked,#newmainbtn_send:checked,#newmainbtn_over:checked
 {
-	width:100px;
-	height:30px;
 	border:0px;
 	background:rgba(236,67,56,1);
 }
@@ -176,16 +172,32 @@ QTabWidget#newmaintbwgt QTabBar::tab
 	selection-background-color: #f4f4f4;
 }
 
-#newmaintablewidget_order  QHeaderView::section
+#newmainlabel_mgtitile
 {
-	border: 0px;
-	font: 75 14px "微软雅黑";
-	color:rgba(41,41,41,1);
-	background:rgb(242,242,242);
+	font: 75 24px "微软雅黑";
+	color:rgba(51,51,51,1);
 }
+#newmainbtn_hide
+{
+	border-image: url(:newmainhide.png);
+	border:0px solid;
+}
+#newmaintablewidget_order
+{
+	font: 16px "微软雅黑";
+	color: rgb(51, 51, 51);
+	selection-background-color: #f4f4f4;
+}
+#newmaintablewidget_order QHeaderView::section
+{  
+	font: 16px "微软雅黑";
+	color: rgb(51, 51, 51);
+	border: 0px;
+	background: rgb(230, 230, 230);
+} 
 #newmaintablewidget_order QHeaderView::down-arrow
 {	
-	border: 0px;
+	border:0px;
 }
 #newmaintablewidget_order QHeaderView::up-arrow
 {	
@@ -209,11 +221,6 @@ QTabWidget#newmaintbwgt QTabBar::tab
 #newmaintablewidget_order QScrollBar::sub-line:vertical
 {
 	height: 0px;
-}
-#newmainlabel_mgtitile
-{
-	font: 75 24px "微软雅黑";
-	color:rgba(51,51,51,1);
 }</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7">
@@ -317,7 +324,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
            <string notr="true"/>
           </property>
           <property name="text">
-           <string>logo</string>
+           <string/>
           </property>
          </widget>
         </item>
@@ -523,7 +530,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
         <item>
          <widget class="QLabel" name="newmainlabel_netstatus">
           <property name="text">
-           <string>网络</string>
+           <string>网络正常</string>
           </property>
          </widget>
         </item>
@@ -717,21 +724,21 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </spacer>
          </item>
          <item>
-          <widget class="QPushButton" name="newmainbtn_close">
+          <widget class="QPushButton" name="newmainbtn_hide">
            <property name="minimumSize">
             <size>
-             <width>30</width>
-             <height>30</height>
+             <width>24</width>
+             <height>24</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
-             <width>30</width>
-             <height>30</height>
+             <width>24</width>
+             <height>24</height>
             </size>
            </property>
            <property name="text">
-            <string>close</string>
+            <string/>
            </property>
           </widget>
          </item>
@@ -2922,7 +2929,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                   </spacer>
                  </item>
                  <item>
-                  <widget class="QLineEdit" name="newmainline_serach">
+                  <widget class="ClickedLineEdit" name="newmainline_serach">
                    <property name="minimumSize">
                     <size>
                      <width>240</width>
@@ -2935,6 +2942,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
                      <height>30</height>
                     </size>
                    </property>
+                   <property name="placeholderText">
+                    <string>请输入订单号或电话进行查询</string>
+                   </property>
                   </widget>
                  </item>
                  <item>
@@ -3020,7 +3030,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                   <number>0</number>
                  </property>
                  <property name="rightMargin">
-                  <number>0</number>
+                  <number>13</number>
                  </property>
                  <item>
                   <spacer name="horizontalSpacer_76">
@@ -3032,7 +3042,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>10</width>
+                     <width>13</width>
                      <height>20</height>
                     </size>
                    </property>
@@ -3040,6 +3050,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_needrefund">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>需退单</string>
                    </property>
@@ -3056,6 +3078,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_refunded">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>已退单</string>
                    </property>
@@ -3069,6 +3103,24 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_all">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>全部</string>
                    </property>
@@ -3082,6 +3134,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_new">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>新订单</string>
                    </property>
@@ -3095,6 +3159,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_make">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>制作中</string>
                    </property>
@@ -3108,6 +3184,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_send">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>配送中</string>
                    </property>
@@ -3121,6 +3209,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_makeover">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>完成中</string>
                    </property>
@@ -3134,6 +3234,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_over">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>已完成</string>
                    </property>
@@ -3147,6 +3259,18 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  </item>
                  <item>
                   <widget class="QPushButton" name="newmainbtn_future">
+                   <property name="minimumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>88</width>
+                     <height>32</height>
+                    </size>
+                   </property>
                    <property name="text">
                     <string>预约单</string>
                    </property>
@@ -3163,9 +3287,12 @@ QTabWidget#newmaintbwgt QTabBar::tab
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
+                   <property name="sizeType">
+                    <enum>QSizePolicy::Expanding</enum>
+                   </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>40</width>
+                     <width>20</width>
                      <height>20</height>
                     </size>
                    </property>
@@ -3226,6 +3353,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
                    <property name="leftMargin">
                     <number>12</number>
                    </property>
+                   <property name="rightMargin">
+                    <number>10</number>
+                   </property>
                    <item>
                     <widget class="QTableWidget" name="newmaintablewidget_order">
                      <property name="styleSheet">
@@ -3237,15 +3367,30 @@ QTabWidget#newmaintbwgt QTabBar::tab
                      <property name="horizontalScrollBarPolicy">
                       <enum>Qt::ScrollBarAlwaysOff</enum>
                      </property>
+                     <property name="editTriggers">
+                      <set>QAbstractItemView::NoEditTriggers</set>
+                     </property>
+                     <property name="selectionMode">
+                      <enum>QAbstractItemView::SingleSelection</enum>
+                     </property>
+                     <property name="selectionBehavior">
+                      <enum>QAbstractItemView::SelectRows</enum>
+                     </property>
                      <property name="showGrid">
                       <bool>false</bool>
                      </property>
                      <property name="gridStyle">
-                      <enum>Qt::NoPen</enum>
+                      <enum>Qt::SolidLine</enum>
                      </property>
                      <attribute name="horizontalHeaderHighlightSections">
                       <bool>false</bool>
                      </attribute>
+                     <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+                      <bool>true</bool>
+                     </attribute>
+                     <attribute name="verticalHeaderVisible">
+                      <bool>false</bool>
+                     </attribute>
                      <column>
                       <property name="text">
                        <string>序号</string>
@@ -3466,7 +3611,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                       </property>
                       <property name="sizeHint" stdset="0">
                        <size>
-                        <width>60</width>
+                        <width>10</width>
                         <height>20</height>
                        </size>
                       </property>
@@ -3501,6 +3646,11 @@ QTabWidget#newmaintbwgt QTabBar::tab
     <signal>clicked()</signal>
    </slots>
   </customwidget>
+  <customwidget>
+   <class>ClickedLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">view/clickedlineedit.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

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;