1.打印对接完成;2.界面优化;3.界面添加扫码取餐

Resources/skin/deaufult.qrc

@@ -36,11 +36,16 @@
 		<file>refund_on.png</file>
 		<file>setting_off.png</file>
 		<file>setting_on.png</file>
+		<file>scan_off.png</file>
+		<file>scan_on.png</file>
 		<file>mainlogo.png</file>
 		<file>newmainhide.png</file>
 		<file>com.png</file>
 		<file>lpt.png</file>
 		<file>net.png</file>
 		<file>dev.png</file>
+		<file>login_back.png</file>
+		<file>login_save.png</file>
+		<file>login_unsave.png</file>
     </qresource>
 </RCC>
\ No newline at end of file

Resources/skin/deaufult.qss

@@ -689,7 +689,7 @@ QWidget
 /*---------------------------------PickUpForm[end]-------------------------------------*/
 
 
-/*---------------------------------NewMainForm[end]-------------------------------------*/
+/*---------------------------------NewMainForm[start]-------------------------------------*/
 
 #newmainlabel_logo
 {
@@ -713,6 +713,10 @@ QWidget
 }
 /*---------------------------------NewMainForm[end]-------------------------------------*/
 
+/*---------------------------------NewLogonForm[start]-------------------------------------*/
+
+/*---------------------------------NewLogonForm[end]-------------------------------------*/
+
 
 
 

takeout/base/Print/newprintlib.cpp

@@ -397,6 +397,7 @@ bool NewPrintLib::PrintLabel(const QString &config, OrderObject *order)
             -- num;
         }
     }
+    return true;
 }
 
 bool NewPrintLib::DoBackPrint(int page_depart, int prod_depart, int page_num, const QStringList &stallsprods, const QString &config, const QString &context, OrderObject *order)
@@ -411,8 +412,9 @@ bool NewPrintLib::DoBackPrint(int page_depart, int prod_depart, int page_num, co
 
     if(GetProdList(stallsprods, order, list) == false)
     {
-        QLOG_ERROR() << "NewPrintLib::DoBackPrint::GetProdList failed";
-        return false;
+        QLOG_WARN() << "NewPrintLib::DoBackPrint::GetProdList failed";
+        //无需打印
+        return true;
     }
 
     QList<OrderObject> orderlist;
@@ -420,7 +422,8 @@ bool NewPrintLib::DoBackPrint(int page_depart, int prod_depart, int page_num, co
     if(GetObjList(page_depart, prod_depart, list, orderlist, order) == false)
     {
         QLOG_ERROR() << "NewPrintLib::DoBackPrint::GetObjList failed";
-        return false;
+        //无需打印
+        return true;
     }
 
     int i = 0; //打印的页数

takeout/control/orderlocalizework.cpp

@@ -35,6 +35,8 @@ bool OrderLocalizeWork::event(QEvent *e)
 
         GETEVENTINFO(orderid,e,QString);
 
+        QLOG_DEBUG() << "otpOrder failed";
+
         otpOrder(orderid);
 
         return true;

takeout/control/orderprintwork.h

-#ifndef ORDERPRINTWORK_H
+#ifndef ORDERPRINTWORK_H
 #define ORDERPRINTWORK_H
 
 #include <QObject>
 #include "workobject.h"
+#include "model/orderObject.h"
 
 class orderprintwork : public WorkObject
 {
@@ -11,7 +12,20 @@ public:
     explicit orderprintwork(WorkObject *parent = 0);
 
     virtual bool event(QEvent *e);
-
+private:
+    void Print(const QString &orderid);
+    //获取打印模板;
+    bool GetPrtTemplet(int prttype, int pagew, QString &context, const OrderObject &order);
+    //小票打印
+    void DoPrint(const QString &prtname, const QString &orderid, const QVariantMap config, bool &flag);
+    //标签打印
+    void DoLabelPrint(const QString &prtname, const QString &orderid, const QVariantMap config, bool &flag);
+    //后厨打印
+    void DoBackPrint(const QString &prtname, const QString &orderid, const QVariantMap config, bool &flag);
+    //工具函数
+    void MapToString(const QVariantMap map, QString &config);
+    //展示订单打印结果
+    void ResultShow(const QString &orderid, bool flag);
 };
 
 #endif // ORDERPRINTWORK_H

takeout/main.cpp

@@ -15,7 +15,8 @@
 #include "control/prtlocalizework.h"
 #include "control/stallsgetwork.h"
 #include "base/Dump/dump.h"
-#include "view/loginform.h"
+//#include "view/loginform.h"
+#include "view/newloginform.h"
 #include <QVariantMap>
 #include <QThread>
 #include <QDir>
@@ -200,7 +201,8 @@ int main(int argc, char *argv[])
     mainform.MyShow();
     loginform.showfull();
 #else
-    LoginForm loginform;
+
+    NewLoginForm loginform;
     NewMainForm mainform;
     FloatForm floatform;
     mainform.MyShow();

takeout/preDefine.h

@@ -307,6 +307,8 @@
 #define FILE_PRINTO2O80_TEMPLET             "printtempleto2o80.txt"
 #define FILE_PRINTO2OZZ_TEMPLET             "printtempleto2ozz.txt"
 #define FILE_PRINTO2OZZ80_TEMPLET           "printtempleto2ozz80.txt"
+#define FILE_BACKPRINT_TEMPLET              "backtemplet.txt"
+#define FILE_BACKPRINT80_TEMPLET            "backtemplet80.txt"
 
 
 #define DEFAULT_PRINTF_MAIN_SESSION         "Printer"

takeout/takeout.pro

@@ -21,7 +21,7 @@ LIBS += -L$$PWD/lib -llibeay32 -lssleay32 -lwinspool
 LIBS += -lWs2_32
 LIBS += -lDbghelp
 
-#DEFINES += USE_QAACTION
+DEFINES += USE_QAACTION
 DEFINES += FM_NEW_UI
 
 #DEFINES += FM_TEST
@@ -75,7 +75,8 @@ SOURCES += main.cpp \
     control/stallsgetwork.cpp \
     model/posstallspool.cpp \
     view/prttypeform.cpp \
-    view/newloginform.cpp
+    view/newloginform.cpp \
+    view/newpickupform.cpp
 
 HEADERS  += \
     event/fmapplication.h \
@@ -126,7 +127,8 @@ HEADERS  += \
     control/stallsgetwork.h \
     model/posstallspool.h \
     view/prttypeform.h \
-    view/newloginform.h
+    view/newloginform.h \
+    view/newpickupform.h
 
 DISTFILES += takeout.rc
 
@@ -148,5 +150,6 @@ FORMS += \
     view/mainbtn.ui \
     view/newdetailform.ui \
     view/prttypeform.ui \
-    view/newloginform.ui
+    view/newloginform.ui \
+    view/newpickupform.ui
     

takeout/view/loginform.ui

@@ -268,7 +268,7 @@
            <enum>Qt::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
+           <enum>QSizePolicy::Fixed</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -297,6 +297,9 @@
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
@@ -695,10 +698,13 @@
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
-              <height>40</height>
+              <height>70</height>
              </size>
             </property>
            </spacer>

takeout/view/mainbtn.cpp

@@ -5,6 +5,8 @@
 
 #include <qDebug>
 
+#include "QsLog.h"
+
 MainBtn::MainBtn(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MainBtn)
@@ -24,7 +26,7 @@ void MainBtn::setChecked(bool check)
 
     QString type =  this->property("type").toString();
 
-    //qDebug() << "====" << type << ";" << check << _type;
+    QLOG_DEBUG() << "====" << type << ";" << check << _type;
 
     if(type.compare("order",Qt::CaseInsensitive) == 0)
     {
@@ -59,7 +61,7 @@ void MainBtn::setChecked(bool check)
         return ;
     }
 
-    if(type.compare("set",Qt::CaseInsensitive) == 0);
+    if(type.compare("set",Qt::CaseInsensitive) == 0)
     {
         if(check)
         {
@@ -74,6 +76,26 @@ void MainBtn::setChecked(bool check)
         }
         return ;
     }
+
+    if(type.compare("scan",Qt::CaseInsensitive) == 0)
+    {
+        QLOG_DEBUG() << "*scan" << type;
+        QLOG_DEBUG() << "*check" << check;
+
+        if(check)
+        {
+            ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(255,255,255,1)}");
+            ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:scan_on.png)}");
+            _info = QString::fromUtf8("\xE6\x89\xAB\xE7\xA0\x81\xE5\x8F\x96\xE9\xA4\x90");
+            QLOG_DEBUG() << "*scan" << _info;
+        }
+        else
+        {
+            ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(54,60,66,1)}");
+            ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:scan_off.png)}");
+        }
+        return ;
+    }
 }
 
 void MainBtn::mousePressEvent(QMouseEvent *e)
@@ -89,6 +111,10 @@ void MainBtn::mousePressEvent(QMouseEvent *e)
 void MainBtn::SetText(QString data, QString type)
 {
     _type = type;
+
+    QLOG_DEBUG() << "*type" << _type;
+    QLOG_DEBUG() << "*data" << data;
+
     ui->mainbtnlabel_name->setText(data);
 
     ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(255,255,255,1)}");
@@ -110,6 +136,12 @@ void MainBtn::SetText(QString data, QString type)
         ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:setting_off.png)}");
         return ;
     }
+
+    if(type.compare("scan",Qt::CaseInsensitive) == 0)
+    {
+        ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:scan_off.png)}");
+        return ;
+    }
 }
 
 QString MainBtn::info() const

takeout/view/mainbtn.ui

@@ -7,19 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>160</width>
-    <height>80</height>
+    <height>60</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>160</width>
-    <height>80</height>
+    <height>60</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>160</width>
-    <height>80</height>
+    <height>60</height>
    </size>
   </property>
   <property name="windowTitle">

takeout/view/newmainform.cpp

@@ -49,8 +49,8 @@ NewMainForm::NewMainForm(QWidget *parent) :
     FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
     FMApplication::subscibeEvent(this, PosEvent::s_show_stalls);
 
-    this->show();
-    //this->showFullScreen();
+    //this->show();
+    this->showFullScreen();
     this->hide();
 
     this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
@@ -61,6 +61,13 @@ NewMainForm::NewMainForm(QWidget *parent) :
     _padForm = new PadForm(this);
     _detailForm = new NewDetailForm(this);
     _prttypeForm = new PrtTypeForm(this);
+    _pickform = new NewPickupForm(this);
+
+    QVBoxLayout *qlt = new QVBoxLayout();
+    qlt->addWidget(_pickform);
+    ui->newmainwgt_scan->setLayout(qlt);
+
+    connect(_pickform, &NewPickupForm::showorderinfo, this, &NewMainForm::onPickUpGetOrder);
 
     connect(_prttypeForm, &PrtTypeForm::BtnClicket, this, &NewMainForm::onPrtTypeChanged);
 
@@ -202,6 +209,17 @@ void NewMainForm::onSerachOrder(const QString &key)
     }
 }
 
+void NewMainForm::onPickUpGetOrder(QString orderid)
+{
+    OrderObject order;
+    if(!PosOrderPool::GetOrderObject(orderid, order))
+        return ;
+
+    onHideAlert();
+    _detailForm->InitData(&order);
+    _detailForm->show();
+}
+
 void NewMainForm::onSearchResultItemClicked(QListWidgetItem *item)
 {
     ui->newmainline_serach->clear();
@@ -267,8 +285,8 @@ void NewMainForm::onShowAlert(AlertForm::Type type, const QString &msg)
 
 void NewMainForm::FullShow()
 {
-    this->show();
-    //this->showFullScreen();
+    //this->show();
+    this->showFullScreen();
     InitPageNum();
 }
 
@@ -475,12 +493,15 @@ void NewMainForm::InitMainBtn()
     ui->newmainbtn_order->SetText("\xE8\xAE\xA2\xE5\x8D\x95\xE7\xAE\xA1\xE7\x90\x86", MAIN_ORDER);
     ui->newmainbtn_refund->SetText("\xE9\x80\x80\xE5\x8D\x95", MAIN_REFUND);
     ui->newmainbtn_set->SetText("\xE8\xAE\xBE\xE7\xBD\xAE", MAIN_SET);
+    ui->newmainbtn_scan->SetText("\xE6\x89\xAB\xE7\xA0\x81\xE5\x8F\x96\xE9\xA4\x90", MAIN_SCAN);
     ui->newmainbtn_order->setProperty("type", "order");
     ui->newmainbtn_refund->setProperty("type", "refund");
     ui->newmainbtn_set->setProperty("type", "set");
+    ui->newmainbtn_scan->setProperty("type", "scan");
     _main_btn.insert(ui->newmainbtn_order);
     _main_btn.insert(ui->newmainbtn_refund);
     _main_btn.insert(ui->newmainbtn_set);
+    _main_btn.insert(ui->newmainbtn_scan);
 }
 
 void NewMainForm::SetMainBtnCheck(MainBtn *wgt)
@@ -567,8 +588,8 @@ bool NewMainForm::event(QEvent *e)
 
     if(e->type() == PosEvent::s_show_mainform)
     {
-        this->show();
-        //this->showFullScreen();
+        //this->show();
+        this->showFullScreen();
         return true;
     }
 
@@ -901,15 +922,30 @@ void NewMainForm::InitWidget(QString type)
         InitSetWidget();
         ui->newmainwgt_order->hide();
         ui->newmainwgt_set->show();
+        ui->newmainwgt_scan->hide();
+    }
+    else if(type.compare(MAIN_SCAN, Qt::CaseInsensitive) == 0)
+    {
+        InitScanWidget();
+        ui->newmainwgt_order->hide();
+        ui->newmainwgt_set->hide();
+        ui->newmainwgt_scan->show();
     }
     else
     {
         InitOrderWidget(type);
         ui->newmainwgt_order->show();
         ui->newmainwgt_set->hide();
+        ui->newmainwgt_scan->hide();
     }
 }
 
+void NewMainForm::InitScanWidget()
+{
+    SetMainBtnCheck(ui->newmainbtn_scan);
+    _pickform->Initshow();
+}
+
 void NewMainForm::on_newmainbtn_clicked()
 {
     ui->newmainline_serach->clear();
@@ -920,6 +956,9 @@ void NewMainForm::on_newmainbtn_clicked()
 
     QString type = pBtn->property("type").toString();
 
+    QLOG_DEBUG() << "**type" << type;
+    QLOG_DEBUG() << "**info" << pBtn->info();
+
     if(!type.isEmpty())
     {
         InitWidget(type);

takeout/view/newmainform.h

@@ -22,11 +22,13 @@
 #include "view/padForm.h"
 #include "view/newdetailform.h"
 #include "view/prttypeform.h"
+#include "view/newpickupform.h"
 
 
 #define MAIN_ORDER  "order"
 #define MAIN_REFUND "refund"
 #define MAIN_SET    "set"
+#define MAIN_SCAN   "scan"
 
 #define SET_PRT_DV  "dv"
 #define SET_PRT_COM  "com"
@@ -80,6 +82,7 @@ public slots:
     void onMainTableItemClicked(QTableWidgetItem *item);
     void onSerachOrder(const QString &key);
     void onPrtTypeChanged(int type);
+    void onPickUpGetOrder(QString orderid);
 private slots:
     void on_newmainbtn_clicked();
 
@@ -151,6 +154,9 @@ private:
     QButtonGroup _btnGroup;
     //当前选中打印机类型
     int _prttype;
+    //扫码取餐界面
+    NewPickupForm *_pickform;
+
 private:
     void InitOrderWidget(QString type);
     void InitSetWidget();
@@ -191,6 +197,7 @@ private:
     void onSetStalls(QVariantMap &map);
     void GetStallsText(QString stallsid, QString stallsname, QString &text);
     bool GetContext(QString &context);
+    void InitScanWidget();
 };
 
 class NewMainFormDataProcess

takeout/view/newmainform.ui

@@ -18,7 +18,7 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>2301</width>
+    <width>2311</width>
     <height>600</height>
    </size>
   </property>
@@ -106,6 +106,12 @@ QTabWidget#newmaintbwgt QTabBar::tab
 	height:50;
 	font: 12pt &quot;微软雅黑&quot;;
 }
+
+#newmaintbwgt
+{
+	background-color: rgb(255, 255, 255);
+}
+
 #newmaincombx_prttype,#newmainbtn_prtadd,#newmainbtn_prttest,#newmainbtn_prtsave,#newmainbtn_prtdel,#newmainlabel_settitle
 {
 	font: 12pt &quot;微软雅黑&quot;;
@@ -255,6 +261,15 @@ QTabWidget#newmaintbwgt QTabBar::tab
 {
 	font: 16px &quot;微软雅黑&quot;;
 	background-color: rgb(248, 248, 186);
+}
+#newmaintablewidget_order::item
+{
+	border-bottom:1px solid #E6E6E6;
+}
+#newmaintablewidget_order
+{
+	border:1px solid rgb(230,230,230);
+	border-radius:4px;
 }</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7">
@@ -313,8 +328,8 @@ QTabWidget#newmaintbwgt QTabBar::tab
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>36</width>
-          <height>40</height>
+          <width>26</width>
+          <height>26</height>
          </size>
         </property>
        </spacer>
@@ -407,6 +422,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
        <widget class="MainBtn" name="newmainbtn_refund" native="true"/>
       </item>
       <item>
+       <widget class="MainBtn" name="newmainbtn_scan" native="true"/>
+      </item>
+      <item>
        <widget class="MainBtn" name="newmainbtn_set" native="true"/>
       </item>
       <item>
@@ -1211,13 +1229,13 @@ QTabWidget#newmaintbwgt QTabBar::tab
                     <widget class="QComboBox" name="newmaincombx_prttype">
                      <property name="minimumSize">
                       <size>
-                       <width>160</width>
+                       <width>200</width>
                        <height>0</height>
                       </size>
                      </property>
                      <property name="maximumSize">
                       <size>
-                       <width>160</width>
+                       <width>200</width>
                        <height>16777215</height>
                       </size>
                      </property>
@@ -4600,6 +4618,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
            </layout>
           </widget>
          </item>
+         <item>
+          <widget class="QWidget" name="newmainwgt_scan" native="true"/>
+         </item>
         </layout>
        </widget>
       </item>
@@ -4612,7 +4633,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
   <customwidget>
    <class>ClickedLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">view/clickedlineedit.h</header>
+   <header>view/clickedlineedit.h</header>
   </customwidget>
   <customwidget>
    <class>MainBtn</class>
@@ -4882,6 +4903,22 @@ QTabWidget#newmaintbwgt QTabBar::tab
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>newmainbtn_scan</sender>
+   <signal>clicked()</signal>
+   <receiver>NewMainForm</receiver>
+   <slot>on_newmainbtn_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>79</x>
+     <y>83</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>399</x>
+     <y>299</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_newmainbtn_clicked()</slot>

takeout/view/newpickupform.cpp

+#include "newpickupform.h"
+#include "ui_newpickupform.h"
+#include <QKeyEvent>
+#include "QsLog.h"
+#include "model/posorderpool.h"
+
+NewPickupForm::NewPickupForm(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::NewPickupForm)
+{
+    ui->setupUi(this);
+}
+
+NewPickupForm::~NewPickupForm()
+{
+    delete ui;
+}
+
+void NewPickupForm::Initshow()
+{
+    ui->widgetmsg->show();
+    ui->widgetinput->show();
+    ui->widgetok->hide();
+    ui->widgetrlt->hide();
+
+    ui->lineEditpickupcode->show();
+    ui->lineEditpickupcode->clear();
+    ui->labelpickupwar->hide();
+    ui->labelpickupmsg->show();
+    ui->labelpickupmsg->setText(QString::fromUtf8("\xE8\xAF\xB7\xE6\x89\xAB\xE7\xA0\x81\xE7\x94\xA8\xE6\x88\xB7\xE5\x8F\x96\xE9\xA4\x90\xE7\xA0\x81"));
+    ui->lineEditpickupcode->setFocus();
+    this->show();
+}
+
+void NewPickupForm::keyPressEvent(QKeyEvent *e)
+{
+    QLOG_DEBUG() << "*****************:" << e->key();
+
+    if(e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return)  //判断是否是回车键按下
+    {
+        if(ui->lineEditpickupcode->text().isEmpty())
+        {
+            ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE5\x8F\x96\xE9\xA4\x90\xE7\xA0\x81\xE4\xB8\x8D\xE8\x83\xBD\xE4\xB8\xBA\xE7\xA9\xBA"));
+            return ;
+        }
+
+        int status = DefaultOrder, refund_status = DefaultOrder;
+        bool oldorder;
+
+        if(PosOrderPool::GetOrderStatus(ui->lineEditpickupcode->text(), status, refund_status, oldorder) && refund_status != CompleteRefundOrder && status != CancelOrder)
+        {
+            QLOG_DEBUG() << "*****************:" << status << refund_status;
+
+            if(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder)
+            {
+                ui->widgetrlt->show();
+                ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE5\xB7\xB2\xE7\x94\xB3\xE8\xAF\xB7\xE9\x80\x80\xE5\x8D\x95\xE7\x9A\x84\xE8\xAE\xA2\xE5\x8D\x95\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE5\x85\x88\xE6\x8B\x92\xE7\xBB\x9D\xE9\x80\x80\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
+                return ;
+            }
+
+            if(status == NewOrder && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
+            {
+                ui->widgetrlt->show();
+                ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE6\x96\xB0\xE8\xAE\xA2\xE5\x8D\x95\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE5\x85\x88\xE6\x8E\xA5\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
+                return ;
+            }
+
+            if((status == CompleteOrder || status == ServiceOrder) && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
+            {
+                ui->labelpickupmsg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE5\x8F\xAF\xE8\x83\xBD\xE5\xB7\xB2\xE7\xBB\x8F\xE8\xA2\xAB\xE6\x8B\xBF\xE8\xB5\xB0\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE7\xA1\xAE\xE8\xAE\xA4\xE5\x8F\x96\xE9\xA4\x90\xE7\x94\xA8\xE6\x88\xB7\xE6\x98\xAF\xE5\x90\xA6\xE6\xAD\xA3\xE7\xA1\xAE\x21"));
+                ui->labelpickupwar->show();
+                ui->widgetok->show();
+                ui->widgetmsg->show();
+                ui->labelpickupwar->show();
+                ui->widgetrlt->hide();
+                ui->widgetinput->hide();
+                return ;
+            }
+
+            this->hide();
+            emit showorderinfo(ui->lineEditpickupcode->text());
+        }
+        else
+        {
+            QLOG_DEBUG() << "*****************:" << status << refund_status;
+            ui->widgetrlt->show();
+            ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE4\xB8\x8D\xE5\xAD\x98\xE5\x9C\xA8"));
+        }
+
+        return ;
+    }
+
+    return QWidget::keyPressEvent(e);
+}

takeout/view/newpickupform.h

+#ifndef NEWPICKUPFORM_H
+#define NEWPICKUPFORM_H
+
+#include <QWidget>
+
+namespace Ui {
+class NewPickupForm;
+}
+
+class NewPickupForm : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit NewPickupForm(QWidget *parent = 0);
+    ~NewPickupForm();
+
+    void Initshow();
+
+    void keyPressEvent(QKeyEvent *e);
+signals:
+    void showorderinfo(QString pickupid);
+private:
+    Ui::NewPickupForm *ui;
+};
+
+#endif // NEWPICKUPFORM_H

takeout/view/ordertypeform.cpp

@@ -3,6 +3,8 @@
 #include <QTableWidget>
 #include <QMouseEvent>
 
+#include "QsLog.h"
+
 
 OrderTypeForm::OrderTypeForm(QWidget *parent) :
     QWidget(parent),
@@ -20,17 +22,6 @@ OrderTypeForm::~OrderTypeForm()
     delete ui;
 }
 
-void OrderTypeForm::mousePressEvent(QMouseEvent *e)
-{
-    if(e->buttons()&Qt::LeftButton)
-    {
-        QTableWidget* table = (QTableWidget*)parent();
-        emit table->itemClicked(table->selectedItems()[0]);
-        return ;
-    }
-    return QWidget::mousePressEvent(e);
-}
-
 void OrderTypeForm::InitShow(QString order_id, int order_status, int refund_status, int order_type)
 {
     _order_id = order_id;

takeout/view/ordertypeform.h

@@ -2,6 +2,7 @@
 #define ORDERTYPEFORM_H
 
 #include <QWidget>
+#include <QTableWidget>
 
 #include "model/posorderpool.h"
 
@@ -30,8 +31,6 @@ public:
     int order_type() const;
 
     void SetNameStyle(int status);
-
-    void mousePressEvent(QMouseEvent *e);
 private:
     Ui::OrderTypeForm *ui;
     QString _order_id;