Skip to content

F
fmtakeout
Commit 1d0a8acc by 李定达
Options

1.扫码取餐调整完成;2.界面优化完成;3.自动登陆

parent d947008d
Showing with 992 additions and 453 deletions
Resources/skin/scan_off.png
Resources/skin/scan_off.png

6.78 KB | W: | H:

Resources/skin/scan_off.png

1.02 KB | W: | H:

Resources/skin/scan_off.png
Resources/skin/scan_off.png
Resources/skin/scan_off.png
Resources/skin/scan_off.png
  • 2-up
  • Swipe
  • Onion skin
Resources/skin/scan_on.png
Resources/skin/scan_on.png

7.02 KB | W: | H:

Resources/skin/scan_on.png

1.02 KB | W: | H:

Resources/skin/scan_on.png
Resources/skin/scan_on.png
Resources/skin/scan_on.png
Resources/skin/scan_on.png
  • 2-up
  • Swipe
  • Onion skin
takeout/preDefine.h
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#define INI_POSNO "info/posNo" #define INI_POSNO "info/posNo"
#define INI_PASSWORD "info/password" #define INI_PASSWORD "info/password"
#define INI_AUTOCONFIRM "info/autoconfirm" #define INI_AUTOCONFIRM "info/autoconfirm"
#define INI_AUTOLOGIN "info/autologin"
#define INI_UIVISIBLE "Ui/visible" #define INI_UIVISIBLE "Ui/visible"
#define INI_DELEORDERTIMER "all/dltordertimer" #define INI_DELEORDERTIMER "all/dltordertimer"
...@@ -321,17 +322,17 @@ ...@@ -321,17 +322,17 @@
#define PRT_CONF_TYPE "type" #define PRT_CONF_TYPE "type"
#define PRT_CONF_LABELPRTTYPE "labelprttype" #define PRT_CONF_LABELPRTTYPE "labelprttype"
#define PRT_CONF_COM "com" #define PRT_CONF_COM "com"
#define PRT_CONF_BAUDRATE "Baudrate" #define PRT_CONF_BAUDRATE "baudrate"
#define PRT_CONF_FLOWCONTROL "FlowControl" #define PRT_CONF_FLOWCONTROL "flowcontrol"
#define PRT_CONF_DATABITS "DataBits" #define PRT_CONF_DATABITS "databits"
#define PRT_CONF_PARITY "Parity" #define PRT_CONF_PARITY "parity"
#define PRT_CONF_STOPBITS "StopBits" #define PRT_CONF_STOPBITS "stopbits"
#define PRT_CONF_PAPERWIDTH "PaperWidth" #define PRT_CONF_PAPERWIDTH "paperwidth"
#define PRT_CONF_LPTNAME "parallel" #define PRT_CONF_LPTNAME "parallel"
#define PRT_CONF_IP "IP" #define PRT_CONF_IP "ip"
#define PRT_CONF_NAME "Name" #define PRT_CONF_NAME "name"
#define PRT_CONF_HIGH "high" #define PRT_CONF_HIGH "high"
#define PRT_CONF_WIGTH "wigth" #define PRT_CONF_WIGTH "width"
#define DEFAULT_STALLS_TIMEOUT (60*1000) #define DEFAULT_STALLS_TIMEOUT (60*1000)
......
takeout/view/loginform.cpp
...@@ -166,7 +166,7 @@ bool LoginForm::event(QEvent *e) ...@@ -166,7 +166,7 @@ bool LoginForm::event(QEvent *e)
{ {
this->hide(); this->hide();
onHideAlert(); onHideAlert();
is_login -= true; is_login = true;
//emit showmainform(); //emit showmainform();
DEFAULTPOSTEVENT(PosEvent::s_show_mainform, ""); DEFAULTPOSTEVENT(PosEvent::s_show_mainform, "");
} }
......
takeout/view/newloginform.cpp
...@@ -50,7 +50,11 @@ NewLoginForm::NewLoginForm(QWidget *parent) : ...@@ -50,7 +50,11 @@ NewLoginForm::NewLoginForm(QWidget *parent) :
m_alertForm = new AlertForm(this); m_alertForm = new AlertForm(this);
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
m_autologin = QSettings(configfile, QSettings::IniFormat).value(INI_AUTOLOGIN, 0).toInt();
if(m_autologin)
ui->checkBox_2->setChecked(true);
FMApplication::subscibeEvent(this, PosEvent::s_login_status); FMApplication::subscibeEvent(this, PosEvent::s_login_status);
FMApplication::subscibeEvent(this, PosEvent::s_opt_status); FMApplication::subscibeEvent(this, PosEvent::s_opt_status);
...@@ -103,6 +107,8 @@ void NewLoginForm::showfull() ...@@ -103,6 +107,8 @@ void NewLoginForm::showfull()
{ {
SetStoreInfo(); SetStoreInfo();
this->showFullScreen(); this->showFullScreen();
if(m_autologin == 1)
on_pushButton_login_2_clicked();
return ; return ;
} }
...@@ -163,7 +169,7 @@ bool NewLoginForm::event(QEvent *e) ...@@ -163,7 +169,7 @@ bool NewLoginForm::event(QEvent *e)
{ {
this->hide(); this->hide();
onHideAlert(); onHideAlert();
is_login -= true; is_login = true;
//emit showmainform(); //emit showmainform();
DEFAULTPOSTEVENT(PosEvent::s_show_mainform, ""); DEFAULTPOSTEVENT(PosEvent::s_show_mainform, "");
} }
...@@ -180,6 +186,14 @@ void NewLoginForm::GetCurrLineEdit() ...@@ -180,6 +186,14 @@ void NewLoginForm::GetCurrLineEdit()
void NewLoginForm::on_pushButton_login_2_clicked() void NewLoginForm::on_pushButton_login_2_clicked()
{ {
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
if(ui->checkBox_2->isChecked())
QSettings(configfile, QSettings::IniFormat).setValue(INI_AUTOLOGIN, 1);
else
QSettings(configfile, QSettings::IniFormat).setValue(INI_AUTOLOGIN, 0);
QLOG_DEBUG() << "configfile" << configfile;
QVariantMap map; QVariantMap map;
if(ui->lineEdit_account_2->text().isEmpty() || if(ui->lineEdit_account_2->text().isEmpty() ||
...@@ -229,3 +243,4 @@ void NewLoginForm::on_pushButton_close_clicked() ...@@ -229,3 +243,4 @@ void NewLoginForm::on_pushButton_close_clicked()
//emit showfloat(); //emit showfloat();
DEFAULTPOSTEVENT(PosEvent::s_show_float, ""); DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
} }
takeout/view/newloginform.h
...@@ -36,10 +36,8 @@ public slots: ...@@ -36,10 +36,8 @@ public slots:
private slots: private slots:
void on_pushButton_login_2_clicked(); void on_pushButton_login_2_clicked();
void number_btn_click(); void number_btn_click();
void SetStoreInfo(); void SetStoreInfo();
void on_pushButton_close_clicked(); void on_pushButton_close_clicked();
private: private:
Ui::NewLoginForm *ui; Ui::NewLoginForm *ui;
...@@ -49,6 +47,8 @@ private: ...@@ -49,6 +47,8 @@ private:
// 通知窗口 // 通知窗口
AlertForm *m_alertForm; AlertForm *m_alertForm;
int m_autologin;
}; };
#endif // NEWLOGINFORM_H #endif // NEWLOGINFORM_H
takeout/view/newmainform.cpp
...@@ -67,7 +67,7 @@ NewMainForm::NewMainForm(QWidget *parent) : ...@@ -67,7 +67,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
qlt->addWidget(_pickform); qlt->addWidget(_pickform);
ui->newmainwgt_scan->setLayout(qlt); ui->newmainwgt_scan->setLayout(qlt);
connect(_pickform, &NewPickupForm::showorderinfo, this, &NewMainForm::onPickUpGetOrder); connect(_pickform, &NewPickupForm::showOrderInfo, this, &NewMainForm::onPickUpGetOrder);
connect(_prttypeForm, &PrtTypeForm::BtnClicket, this, &NewMainForm::onPrtTypeChanged); connect(_prttypeForm, &PrtTypeForm::BtnClicket, this, &NewMainForm::onPrtTypeChanged);
...@@ -209,14 +209,14 @@ void NewMainForm::onSerachOrder(const QString &key) ...@@ -209,14 +209,14 @@ void NewMainForm::onSerachOrder(const QString &key)
} }
} }
void NewMainForm::onPickUpGetOrder(QString orderid) void NewMainForm::onPickUpGetOrder(QString orderid, bool flag)
{ {
OrderObject order; OrderObject order;
if(!PosOrderPool::GetOrderObject(orderid, order)) if(!PosOrderPool::GetOrderObject(orderid, order))
return ; return ;
onHideAlert(); onHideAlert();
_detailForm->InitData(&order); _detailForm->InitData(&order, flag);
_detailForm->show(); _detailForm->show();
} }
...@@ -827,6 +827,8 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject) ...@@ -827,6 +827,8 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
pWdg->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type); 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); //pWdg->InitShow(QString::number(orderObject.order_index), orderObject.status, orderObject.refund_status, orderObject.order_type);
connect(pWdg, &OrderTypeForm::showOrderInfo, this, &NewMainForm::onPickUpGetOrder);
table->setCellWidget(0, 1, pWdg); //订单状态 table->setCellWidget(0, 1, pWdg); //订单状态
QTableWidgetItem *item0 = new QTableWidgetItem(QString(orderObject.channel_name)); QTableWidgetItem *item0 = new QTableWidgetItem(QString(orderObject.channel_name));
item0->setTextAlignment(Qt::AlignCenter); item0->setTextAlignment(Qt::AlignCenter);
......
takeout/view/newmainform.h
...@@ -82,7 +82,7 @@ public slots: ...@@ -82,7 +82,7 @@ public slots:
void onMainTableItemClicked(QTableWidgetItem *item); void onMainTableItemClicked(QTableWidgetItem *item);
void onSerachOrder(const QString &key); void onSerachOrder(const QString &key);
void onPrtTypeChanged(int type); void onPrtTypeChanged(int type);
void onPickUpGetOrder(QString orderid); void onPickUpGetOrder(QString orderid, bool flag);
private slots: private slots:
void on_newmainbtn_clicked(); void on_newmainbtn_clicked();
......
takeout/view/newmainform.ui
...@@ -270,6 +270,11 @@ QTabWidget#newmaintbwgt QTabBar::tab ...@@ -270,6 +270,11 @@ QTabWidget#newmaintbwgt QTabBar::tab
{ {
border:1px solid rgb(230,230,230); border:1px solid rgb(230,230,230);
border-radius:4px; border-radius:4px;
}
#newmainwgt_scan
{
background-color: rgb(255, 255, 255);
}</string> }</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7">
......
takeout/view/newpickupform.cpp
...@@ -18,17 +18,9 @@ NewPickupForm::~NewPickupForm() ...@@ -18,17 +18,9 @@ NewPickupForm::~NewPickupForm()
void NewPickupForm::Initshow() void NewPickupForm::Initshow()
{ {
ui->widgetmsg->show(); ui->newpickuplabel_msg->clear();
ui->widgetinput->show(); ui->newpickupline_code->clear();
ui->widgetok->hide(); ui->newpickupline_code->setFocus();
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(); this->show();
} }
...@@ -38,57 +30,84 @@ void NewPickupForm::keyPressEvent(QKeyEvent *e) ...@@ -38,57 +30,84 @@ void NewPickupForm::keyPressEvent(QKeyEvent *e)
if(e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) //判断是否是回车键按下 if(e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) //判断是否是回车键按下
{ {
if(ui->lineEditpickupcode->text().isEmpty()) ui->newpickuplabel_msg->clear();
findOrder();
return ;
}
return QWidget::keyPressEvent(e);
}
void NewPickupForm::findOrder()
{
if(ui->newpickupline_code->text().isEmpty())
{
ui->newpickuplabel_msg->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->newpickupline_code->text(), status, refund_status, oldorder) && refund_status != CompleteRefundOrder && status != CancelOrder)
{
QLOG_DEBUG() << "*****************:" << status << refund_status;
if(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder)
{ {
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")); ui->newpickuplabel_msg->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,\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 ; return ;
} }
int status = DefaultOrder, refund_status = DefaultOrder; if(status == NewOrder && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
bool oldorder;
if(PosOrderPool::GetOrderStatus(ui->lineEditpickupcode->text(), status, refund_status, oldorder) && refund_status != CompleteRefundOrder && status != CancelOrder)
{ {
QLOG_DEBUG() << "*****************:" << status << refund_status; ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE6\x96\xB0\xE8\xAE\xA2\xE5\x8D\x95,\xE8\xAF\xB7\xE5\x85\x88\xE6\x8E\xA5\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
return ;
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
if((status == CompleteOrder || status == ServiceOrder) && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
{ {
QLOG_DEBUG() << "*****************:" << status << refund_status; ui->newpickuplabel_msg->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,\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->widgetrlt->show(); return ;
ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE4\xB8\x8D\xE5\xAD\x98\xE5\x9C\xA8"));
} }
return ; this->hide();
emit showOrderInfo(ui->newpickupline_code->text(), true);
} }
else
{
QLOG_DEBUG() << "*****************:" << status << refund_status;
ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE4\xB8\x8D\xE5\xAD\x98\xE5\x9C\xA8"));
}
}
return QWidget::keyPressEvent(e); void NewPickupForm::onNumClicked()
{
QPushButton *btn = (QPushButton*)sender();
QString num = btn->property("number").toString();
if(!num.isEmpty())
{
ui->newpickupline_code->setText(QString(ui->newpickupline_code->text()).append(num));
}
}
void NewPickupForm::on_newpickupbtn_del_clicked()
{
ui->newpickuplabel_msg->clear();
QString text = ui->newpickupline_code->text();
ui->newpickupline_code->setText(text.left(text.length()-1));
}
void NewPickupForm::on_newpickupbtn_ok_clicked()
{
ui->newpickuplabel_msg->clear();
findOrder();
}
void NewPickupForm::on_newpickupbtn_clean_clicked()
{
ui->newpickuplabel_msg->clear();
ui->newpickupline_code->clear();
} }
takeout/view/newpickupform.h
...@@ -18,8 +18,20 @@ public: ...@@ -18,8 +18,20 @@ public:
void Initshow(); void Initshow();
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
void findOrder();
public slots:
void onNumClicked();
signals: signals:
void showorderinfo(QString pickupid); void showOrderInfo(QString pickupid, bool cpt);
private slots:
void on_newpickupbtn_del_clicked();
void on_newpickupbtn_ok_clicked();
void on_newpickupbtn_clean_clicked();
private: private:
Ui::NewPickupForm *ui; Ui::NewPickupForm *ui;
}; };
......
takeout/view/newpickupform.ui
...@@ -6,397 +6,867 @@ ...@@ -6,397 +6,867 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>560</width>
<height>300</height> <height>577</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="styleSheet">
<string notr="true">#NewPickupForm
{
background-color: rgb(255, 255, 255);
}
#newpickuplabel_title
{
font: 18px &quot;微软雅黑&quot;;
}
#newpickupline_code
{
font: 14px &quot;微软雅黑&quot;;
}
#newpickuplabel_msg
{
color: rgb(236, 67, 56);
font: 14px &quot;微软雅黑&quot;;
}
#newpickupbtn_1,#newpickupbtn_2,#newpickupbtn_4,#newpickupbtn_5,#newpickupbtn_7,#newpickupbtn_8
{
font: 17px &quot;微软雅黑&quot;;
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-right-style: 0px;
border-bottom-style: 0px;
}
#newpickupbtn_3,#newpickupbtn_6,#newpickupbtn_9
{
font: 17px &quot;微软雅黑&quot;;
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-bottom-style: 0px;
}
#newpickupbtn_0,#newpickupbtn_del
{
font: 17px &quot;微软雅黑&quot;;
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-right-style: 0px;
}
#newpickupbtn_clean
{
font: 17px &quot;微软雅黑&quot;;
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
}
#newpickupbtn_ok
{
font: 20px &quot;微软雅黑&quot;;
color: rgb(255, 255, 255);
background-color: rgb(236, 67, 56);
border-radius:4px;
}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>122</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QWidget" name="widgetpickup" native="true"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="styleSheet"> <property name="spacing">
<string notr="true"/> <number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="newpickuplabel_title">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>请扫描用户取餐码或手动输入</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_2">
<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>35</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="newpickupline_code">
<property name="minimumSize">
<size>
<width>298</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>298</width>
<height>40</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<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>3</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="newpickuplabel_msg">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>订单不存在</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_4">
<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>3</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="3" column="0">
<widget class="QPushButton" name="newpickupbtn_4">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>4</string>
</property>
<property name="number" stdset="0">
<string>4</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="newpickupbtn_2">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>2</string>
</property>
<property name="number" stdset="0">
<string>2</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="newpickupbtn_5">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>5</string>
</property>
<property name="number" stdset="0">
<string>5</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="newpickupbtn_7">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>7</string>
</property>
<property name="number" stdset="0">
<string>7</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="newpickupbtn_8">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>8</string>
</property>
<property name="number" stdset="0">
<string>8</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="newpickupbtn_del">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>删除</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="newpickupbtn_6">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>6</string>
</property>
<property name="number" stdset="0">
<string>6</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="newpickupbtn_1">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>1</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="number" stdset="0">
<string>1</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="newpickupbtn_9">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>9</string>
</property>
<property name="number" stdset="0">
<string>9</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="newpickupbtn_0">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
<property name="number" stdset="0">
<string>0</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="newpickupbtn_clean">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>清空</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="newpickupbtn_3">
<property name="minimumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>3</string>
</property>
<property name="number" stdset="0">
<string>3</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_6">
<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>36</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="newpickupbtn_ok">
<property name="minimumSize">
<size>
<width>298</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>298</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>确定</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>75</height>
</size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> </spacer>
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>55</width>
<height>53</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widgetmsg" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelpickupwar">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelpickupmsg">
<property name="text">
<string>你的单没了</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>50</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widgetinput" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>87</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="lineEditpickupcode">
<property name="minimumSize">
<size>
<width>220</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>220</width>
<height>32</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>87</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widgetok" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnpickupok">
<property name="minimumSize">
<size>
<width>80</width>
<height>45</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>45</height>
</size>
</property>
<property name="text">
<string>确定</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widgetrlt" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelpickuprltmsg">
<property name="text">
<string>订单不存在</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<zorder>widgetmsg</zorder>
<zorder>widgetok</zorder>
<zorder>widgetrlt</zorder>
<zorder>widgetinput</zorder>
<zorder>verticalSpacer</zorder>
<zorder>verticalSpacer_2</zorder>
<zorder>verticalSpacer_3</zorder>
<zorder>verticalSpacer_4</zorder>
<zorder>verticalSpacer_5</zorder>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections>
<connection>
<sender>newpickupbtn_0</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>279</x>
<y>435</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_1</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>179</x>
<y>255</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_2</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>279</x>
<y>255</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_3</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>379</x>
<y>255</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_4</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>179</x>
<y>315</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_5</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>279</x>
<y>315</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_6</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>379</x>
<y>315</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_7</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>179</x>
<y>375</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_8</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>279</x>
<y>375</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
<connection>
<sender>newpickupbtn_9</sender>
<signal>clicked()</signal>
<receiver>NewPickupForm</receiver>
<slot>onNumClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>379</x>
<y>375</y>
</hint>
<hint type="destinationlabel">
<x>279</x>
<y>288</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>onNumClicked()</slot>
</slots>
</ui> </ui>
takeout/view/ordertypeform.cpp
...@@ -22,6 +22,16 @@ OrderTypeForm::~OrderTypeForm() ...@@ -22,6 +22,16 @@ OrderTypeForm::~OrderTypeForm()
delete ui; delete ui;
} }
void OrderTypeForm::mousePressEvent(QMouseEvent *e)
{
if(e->buttons()&Qt::LeftButton)
{
emit showOrderInfo(_order_id, false);
return ;
}
return QWidget::mousePressEvent(e);
}
void OrderTypeForm::InitShow(QString order_id, int order_status, int refund_status, int order_type) void OrderTypeForm::InitShow(QString order_id, int order_status, int refund_status, int order_type)
{ {
_order_id = order_id; _order_id = order_id;
......
takeout/view/ordertypeform.h
...@@ -18,6 +18,8 @@ public: ...@@ -18,6 +18,8 @@ public:
explicit OrderTypeForm(QWidget *parent = 0); explicit OrderTypeForm(QWidget *parent = 0);
~OrderTypeForm(); ~OrderTypeForm();
void mousePressEvent(QMouseEvent *e);
void InitShow(QString order_id, int order_status, int refund_status, int order_type); void InitShow(QString order_id, int order_status, int refund_status, int order_type);
QString order_id() const; QString order_id() const;
...@@ -31,6 +33,9 @@ public: ...@@ -31,6 +33,9 @@ public:
int order_type() const; int order_type() const;
void SetNameStyle(int status); void SetNameStyle(int status);
signals:
void showOrderInfo(QString orderid, bool cpt);
private: private:
Ui::OrderTypeForm *ui; Ui::OrderTypeForm *ui;
QString _order_id; QString _order_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment