Skip to content

F
FmTakeaway
Commit 10ba2608 by ss.dai
Options

修改订单搜索

parent 421f152b
Showing with 248 additions and 461 deletions
fmTakeaway/Control/flowControl.cpp
...@@ -635,24 +635,25 @@ void FlowControl::onReEntryOrder(const QString &orderId) ...@@ -635,24 +635,25 @@ void FlowControl::onReEntryOrder(const QString &orderId)
emit showAlert(AlertForm::SUCCESS, "补录销售单成功"); emit showAlert(AlertForm::SUCCESS, "补录销售单成功");
} }
} }
QStringList FlowControl::GetSearchResult(const QString &orderNum)
void FlowControl::onSerachOrder(const QString &text)
{ {
QStringList tmplist; QStringList orderIdList;
if(!orderNum.isEmpty()) if(!text.isEmpty())
{
QMap<QString, OrderObject*>::iterator order;
for(order = m_ordersMap.begin(); order!=m_ordersMap.end(); order++)
{ {
QMap<QString, OrderObject*>::iterator i; QString orderId = order.key();
for(i = m_ordersMap.begin(); i!=m_ordersMap.end(); i++) while (!orderId.at(0).isDigit())
{ {
QString tmpOrderId = i.key(); orderId = orderId.mid(1);
while (!tmpOrderId.at(0).isDigit()) {
tmpOrderId = tmpOrderId.mid(1);
} }
if(tmpOrderId.startsWith(orderNum)) if(orderId.startsWith(text))
{ {
tmplist.append(i.key()); orderIdList.append(order.key());
} }
} }
} }
emit showSearchOrderResult(orderIdList);
return tmplist;
} }
fmTakeaway/Control/flowControl.h
...@@ -93,6 +93,11 @@ signals: ...@@ -93,6 +93,11 @@ signals:
* 返回:NULL * 返回:NULL
* */ * */
void showOrderDetails(OrderObject* orderObject); void showOrderDetails(OrderObject* orderObject);
/* 功能:显示订单搜索结果
* 参数:[1]搜索结果
* 返回:NULL
* */
void showSearchOrderResult(const QStringList& orderIdList);
private slots: private slots:
/* 功能:获取门店信息 /* 功能:获取门店信息
...@@ -198,11 +203,11 @@ public slots: ...@@ -198,11 +203,11 @@ public slots:
* 返回:NULL * 返回:NULL
* */ * */
void onReEntryOrder(const QString& orderId); void onReEntryOrder(const QString& orderId);
/* 功能:根据订单号搜索订单 /* 功能:搜索订单
* 参数:订单号 * 参数:[1]搜索内容
* 返回:NULL * 返回:NULL
* */ * */
QStringList GetSearchResult(const QString &orderNum); void onSerachOrder(const QString& text);
}; };
#endif // FLOWCONTROL_H #endif // FLOWCONTROL_H
fmTakeaway/DTools/clickedLineEdit.cpp 0 → 100644
#include "ClickedLineEdit.h"
fmTakeaway/Dclass/ClickedLineEdit.h → fmTakeaway/DTools/clickedLineEdit.h
...@@ -12,10 +12,17 @@ public: ...@@ -12,10 +12,17 @@ public:
:QLineEdit(parent){} :QLineEdit(parent){}
protected: protected:
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event)
{
if (event->button()==Qt::LeftButton)//拦截点击左键动作
{
emit clicked();
event->accept();//默认处理过程
}
}
signals: signals:
void ShowNumPad(); void clicked();
}; };
#endif // CLICKEDLINEEDIT_H #endif // CLICKEDLINEEDIT_H
fmTakeaway/DTools/sysTray.cpp 0 → 100644
#include "SysTray.h"
#include <QApplication>
SysTray::SysTray(QObject *parent) :
QSystemTrayIcon(parent)
{
_CreatMenu();
setIcon(QIcon(":takeaway.ico"));
}
void SysTray::_CreatMenu()
{
m_menu = new QMenu();
m_menu->setObjectName("trayMenu");
QAction *acQuit = new QAction("退出", m_menu);
connect(acQuit, &QAction::triggered, this, &SysTray::onActionQuitTriggered);
m_menu->addAction(acQuit);
setContextMenu(m_menu);
}
void SysTray::onActionQuitTriggered()
{
qApp->exit();
}
fmTakeaway/Dclass/SysTray.h → fmTakeaway/DTools/sysTray.h
...@@ -11,14 +11,21 @@ class SysTray : public QSystemTrayIcon ...@@ -11,14 +11,21 @@ class SysTray : public QSystemTrayIcon
public: public:
explicit SysTray(QObject *parent = 0); explicit SysTray(QObject *parent = 0);
void creatMenu(); private:
QMenu *m_menu;
signals: /* 功能:创建菜单
void sgOpenMainDialog(); //打开main * 参数:[1]token
void sgExit(); //退出 * 返回:NULL
* */
void _CreatMenu();
private slots: private slots:
void iconIsActived(QSystemTrayIcon::ActivationReason reason); /* 功能:处理退出点击动作
* 参数:NULL
* 返回:NULL
* */
void onActionQuitTriggered();
}; };
#endif // SYSTRAY_H #endif // SYSTRAY_H
fmTakeaway/Dclass/ClickedLineEdit.cpp deleted 100644 → 0
#include "ClickedLineEdit.h"
void ClickedLineEdit::mousePressEvent(QMouseEvent *event)
{
if (event->button()==Qt::LeftButton)//拦截点击左键动作
{
emit ShowNumPad();
event->accept();//默认处理过程
}
return;
}
fmTakeaway/Dclass/SysTray.cpp deleted 100644 → 0
#include "SysTray.h"
SysTray::SysTray(QObject *parent) :
QSystemTrayIcon(parent)
{
creatMenu();
this->setIcon( QIcon(":takeaway.ico"));
connect(this , SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(iconIsActived(QSystemTrayIcon::ActivationReason)));
}
void SysTray::creatMenu()
{
QMenu *menu = new QMenu();
QAction *quit = new QAction( tr("退出"),menu);
connect( quit ,&QAction::triggered, this, &SysTray::sgExit);
menu->addAction(quit);
menu->setStyleSheet( "QMenu\
{\
font: 10pt \"新宋体\";\
color: rgb(0, 0, 0);\
}\
");
this->setContextMenu( menu);
}
void SysTray::iconIsActived(QSystemTrayIcon::ActivationReason reason)
{
switch(reason)
{ //点击托盘显示窗口
case QSystemTrayIcon::Trigger:
emit sgOpenMainDialog();
break;
case QSystemTrayIcon::DoubleClick:
emit sgOpenMainDialog();
break;
default:
break;
}
}
fmTakeaway/NumpadForm.cpp deleted 100644 → 0
#include "NumpadForm.h"
#include "ui_NumpadForm.h"
NumpadForm::NumpadForm(QWidget *parent) :
QDialog(parent),
ui(new Ui::NumpadForm)
{
ui->setupUi(this);
this->setWindowFlags(Qt::FramelessWindowHint);
this->setAttribute(Qt::WA_TranslucentBackground);
this->move(parent->width()*2/3, parent->height()/3);
this->hide();
for(int i=0; i<10; i++)
{
QPushButton *targetBtn = this->findChild<QPushButton*>(QString("numpadBtn%1").arg(i));
if(targetBtn!=NULL)
{
connect(targetBtn, &QPushButton::clicked, this, &NumpadForm::onNumBtnClicked);
}
}
}
NumpadForm::~NumpadForm()
{
delete ui;
}
void NumpadForm::onNumBtnClicked()
{
QPushButton *targetBtn = (QPushButton*)sender();
emit inputNum(targetBtn->property("num").toInt());
}
void NumpadForm::on_numpadBtnCancle_clicked()
{
emit cleanInput();
this->hide();
}
void NumpadForm::on_numpadBtnDel_clicked()
{
emit backInput();
}
fmTakeaway/NumpadForm.h deleted 100644 → 0
#ifndef NUMPADFORM_H
#define NUMPADFORM_H
#include <QDialog>
namespace Ui {
class NumpadForm;
}
class NumpadForm : public QDialog
{
Q_OBJECT
public:
explicit NumpadForm(QWidget *parent = 0);
~NumpadForm();
private:
Ui::NumpadForm *ui;
private slots:
void onNumBtnClicked();
void on_numpadBtnCancle_clicked();
void on_numpadBtnDel_clicked();
signals:
void inputNum(int num);
void backInput();
void cleanInput();
};
#endif // NUMPADFORM_H
fmTakeaway/SRForm.cpp deleted 100644 → 0
#include "SRForm.h"
#include "ui_SRForm.h"
#include <QDebug>
#include <Control/flowControl.h>
SerachResultForm::SerachResultForm(QWidget *parent) :
QDialog(parent),
ui(new Ui::SerachResultForm)
{
ui->setupUi(this);
this->setWindowFlags(Qt::FramelessWindowHint);
this->setAttribute(Qt::WA_TranslucentBackground);
this->hide();
}
SerachResultForm::~SerachResultForm()
{
delete ui;
}
void SerachResultForm::iniListWidget(const QStringList &list)
{
qDebug() << __FUNCTION__;
ui->searchResultListWdg->clear();
if(list.isEmpty())
{
this->hide();
}else
{
this->show();
ui->searchResultListWdg->addItems(list);
}
}
void SerachResultForm::on_searchResultListWdg_itemClicked(QListWidgetItem *item)
{
this->hide();
emit currentTextChanged(item->text());
emit numform();
}
void SerachResultForm::do_searchResult(const QString &result)
{
this->iniListWidget(FlowControl::GetInstance().GetSearchResult(result));
}
fmTakeaway/SRForm.h deleted 100644 → 0
#ifndef SRFORM_H
#define SRFORM_H
#include <QDialog>
#include <QListWidgetItem>
namespace Ui {
class SerachResultForm;
}
class SerachResultForm : public QDialog
{
Q_OBJECT
public:
explicit SerachResultForm(QWidget *parent = 0);
~SerachResultForm();
void iniListWidget(const QStringList&);
private:
Ui::SerachResultForm *ui;
private slots:
void on_searchResultListWdg_itemClicked(QListWidgetItem * item);
;
public slots:
void do_searchResult(const QString& result);
signals:
void currentTextChanged(const QString&);
void numform();
};
#endif // SRFORM_H
fmTakeaway/SRForm.ui deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SerachResultForm</class>
<widget class="QDialog" name="SerachResultForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>310</width>
<height>200</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<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>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QWidget" name="searchResultWdg" native="true">
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QListWidget" name="searchResultListWdg">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="autoScrollMargin">
<number>16</number>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="flow">
<enum>QListView::TopToBottom</enum>
</property>
<property name="spacing">
<number>10</number>
</property>
<property name="viewMode">
<enum>QListView::ListMode</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
fmTakeaway/fmTakeaway.pro
...@@ -39,10 +39,9 @@ SOURCES += main.cpp\ ...@@ -39,10 +39,9 @@ SOURCES += main.cpp\
detailForm.cpp \ detailForm.cpp \
Control/refundControl.cpp \ Control/refundControl.cpp \
Model/stockObject.cpp \ Model/stockObject.cpp \
NumpadForm.cpp \ DTools/clickedLineEdit.cpp \
SRForm.cpp \ DTools/sysTray.cpp \
Dclass/ClickedLineEdit.cpp \ padForm.cpp
Dclass/SysTray.cpp
HEADERS += \ HEADERS += \
mainForm.h \ mainForm.h \
...@@ -65,10 +64,9 @@ HEADERS += \ ...@@ -65,10 +64,9 @@ HEADERS += \
detailForm.h \ detailForm.h \
Control/refundControl.h \ Control/refundControl.h \
Model/stockObject.h \ Model/stockObject.h \
NumpadForm.h \ DTools/clickedLineEdit.h \
SRForm.h \ DTools/sysTray.h \
Dclass/ClickedLineEdit.h \ padForm.h
Dclass/SysTray.h
FORMS += mainForm.ui \ FORMS += mainForm.ui \
alertForm.ui \ alertForm.ui \
...@@ -77,8 +75,7 @@ FORMS += mainForm.ui \ ...@@ -77,8 +75,7 @@ FORMS += mainForm.ui \
settingForm.ui \ settingForm.ui \
floatForm.ui \ floatForm.ui \
detailForm.ui \ detailForm.ui \
NumpadForm.ui \ padForm.ui
SRForm.ui
RC_FILE += fmTakeaway.rc RC_FILE += fmTakeaway.rc
...@@ -89,9 +86,3 @@ CONFIG(release, debug|release) { ...@@ -89,9 +86,3 @@ CONFIG(release, debug|release) {
LIBS += -L../fmPlugin/debug -lfmPlugin LIBS += -L../fmPlugin/debug -lfmPlugin
LIBS += -L../fmPrinter/debug -lfmPrinter LIBS += -L../fmPrinter/debug -lfmPrinter
} }
RESOURCES +=
DISTFILES +=
fmTakeaway/mainForm.cpp
...@@ -30,8 +30,6 @@ MainForm::MainForm(QWidget *parent) : ...@@ -30,8 +30,6 @@ MainForm::MainForm(QWidget *parent) :
qRegisterMetaType< QList<DeliverObject> >("QList<DeliverObject>"); qRegisterMetaType< QList<DeliverObject> >("QList<DeliverObject>");
qRegisterMetaType<AlertForm::Type>("AlertForm::Type"); qRegisterMetaType<AlertForm::Type>("AlertForm::Type");
// 连接信号槽 // 连接信号槽
m_numpadForm = new NumpadForm(this);
m_srForm = new SerachResultForm(this);
connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime); connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime);
connect(this, &MainForm::flowStart, &FlowControl::GetInstance(), &FlowControl::onFlowStart); connect(this, &MainForm::flowStart, &FlowControl::GetInstance(), &FlowControl::onFlowStart);
connect(this, &MainForm::processOrder, &FlowControl::GetInstance(), &FlowControl::onProcessOrder); connect(this, &MainForm::processOrder, &FlowControl::GetInstance(), &FlowControl::onProcessOrder);
...@@ -46,14 +44,10 @@ MainForm::MainForm(QWidget *parent) : ...@@ -46,14 +44,10 @@ MainForm::MainForm(QWidget *parent) :
connect(&FlowControl::GetInstance(), &FlowControl::showDeliverPickForm, this, &MainForm::onShowDeliverPickForm); connect(&FlowControl::GetInstance(), &FlowControl::showDeliverPickForm, this, &MainForm::onShowDeliverPickForm);
connect(&FlowControl::GetInstance(), &FlowControl::showCashierPickForm, this, &MainForm::onShowCashierPickForm); connect(&FlowControl::GetInstance(), &FlowControl::showCashierPickForm, this, &MainForm::onShowCashierPickForm);
connect(&FlowControl::GetInstance(), &FlowControl::showOrderDetails, this, &MainForm::onShowOrderDetails); connect(&FlowControl::GetInstance(), &FlowControl::showOrderDetails, this, &MainForm::onShowOrderDetails);
connect(&m_tray, &SysTray::sgExit, this, &MainForm::close); // 搜索订单的信号槽
connect(ui->mainEdtSearch, &ClickedLineEdit::ShowNumPad, m_numpadForm,&QWidget::show); connect(ui->mainEdtSearch, &ClickedLineEdit::textChanged, &FlowControl::GetInstance(), &FlowControl::onSerachOrder);
connect(m_numpadForm, &NumpadForm::inputNum, this, &MainForm::onInputNum); connect(&FlowControl::GetInstance(), &FlowControl::showSearchOrderResult, this, &MainForm::onShowSearchOrderResult);
connect(m_numpadForm, &NumpadForm::backInput, this, &MainForm::onBackInput);
connect(m_numpadForm, &NumpadForm::cleanInput, this, &MainForm::onCleanInput);
connect(ui->mainEdtSearch,&QLineEdit::textChanged, m_srForm,&SerachResultForm::do_searchResult);
connect(m_srForm, &SerachResultForm::currentTextChanged,this,&MainForm::getOrderDetails);
connect(m_srForm,&SerachResultForm::numform,m_numpadForm,&QWidget::hide);
// 初始化界面 // 初始化界面
_Init(); _Init();
// 开启时间定时器 // 开启时间定时器
...@@ -73,20 +67,38 @@ void MainForm::MyShow() ...@@ -73,20 +67,38 @@ void MainForm::MyShow()
m_pickForm = new PickForm(this); m_pickForm = new PickForm(this);
connect(m_pickForm, &PickForm::updateCashier, this, &MainForm::onUpdateCashier); connect(m_pickForm, &PickForm::updateCashier, this, &MainForm::onUpdateCashier);
m_settingForm = new SettingForm(this); m_settingForm = new SettingForm(this);
m_detailForm = new DetailForm(this); m_detailForm = new DetailForm(this);
m_padForm = new PadForm(this);
m_padForm->move(pos().x()+width()-300, pos().y()+height()-438);
m_padForm->hide();
connect(m_padForm, &PadForm::numClicked, this, &MainForm::onNumClicked);
connect(m_padForm, &PadForm::numDelete, this, &MainForm::onNumDelete);
connect(m_padForm, &PadForm::numClear, ui->mainEdtSearch, &ClickedLineEdit::clear);
m_resultForm = new QListWidget(this);
m_resultForm->setObjectName("mainListWdg0");
m_resultForm->setFixedSize(240, 200);
m_resultForm->move(70, ui->mainFrmSearch->pos().y()-190);
m_resultForm->hide();
connect(m_resultForm, &QListWidget::itemClicked, this, &MainForm::onSearchResultItemClicked);
emit flowStart(); emit flowStart();
QPoint point=ui->mainEdtSearch->mapToParent(ui->mainEdtSearch->pos());
QPoint point1=ui->mainEdtSearch->mapToGlobal(point);
m_srForm->move(point.x(), point1.y()-260);
//QLOG_DEBUG()<<point.x()<<point.y();
return; return;
} }
void MainForm::_Init() void MainForm::_Init()
{ {
this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
// 显示托盘
m_tray.show();
// 设置任务栏图标和标题
setWindowIcon(QIcon(":takeaway.ico"));
// 初始化文字 // 初始化文字
ui->mainLabStoreid->setText(UI_STOREID); ui->mainLabStoreid->setText(UI_STOREID);
ui->mainLabVersion->setText(APP_VERSION); ui->mainLabVersion->setText(APP_VERSION);
...@@ -124,8 +136,6 @@ void MainForm::_Init() ...@@ -124,8 +136,6 @@ void MainForm::_Init()
m_prevBtn = ui->mainBtnNew; m_prevBtn = ui->mainBtnNew;
m_prevTable = ui->mainTableNew; m_prevTable = ui->mainTableNew;
m_currentTable = ui->mainTableNew; m_currentTable = ui->mainTableNew;
//显示系统托盘
m_tray.show();
// 门店营业状态详情暂时屏蔽 // 门店营业状态详情暂时屏蔽
// TODO // TODO
...@@ -190,6 +200,18 @@ void MainForm::onShowOrderDetails(OrderObject *orderObject) ...@@ -190,6 +200,18 @@ void MainForm::onShowOrderDetails(OrderObject *orderObject)
m_detailForm->show(); m_detailForm->show();
} }
void MainForm::onShowSearchOrderResult(const QStringList &orderIdList)
{
if(orderIdList.isEmpty())
{
m_resultForm->hide();
return;
}
m_resultForm->clear();
m_resultForm->addItems(orderIdList);
m_resultForm->show();
}
void MainForm::_RevertBtnTable() void MainForm::_RevertBtnTable()
{ {
m_prevBtn->setChecked(false); m_prevBtn->setChecked(false);
...@@ -368,18 +390,27 @@ void MainForm::onMainTableItemClicked(QTableWidgetItem *item) ...@@ -368,18 +390,27 @@ void MainForm::onMainTableItemClicked(QTableWidgetItem *item)
{ {
emit getOrderDetails(((QTableWidget*)sender())->item(item->row(), 1)->text()); emit getOrderDetails(((QTableWidget*)sender())->item(item->row(), 1)->text());
} }
void MainForm::onInputNum(int num)
void MainForm::on_mainEdtSearch_clicked()
{
m_padForm->show();
}
void MainForm::onNumClicked(const QString &num)
{ {
ui->mainEdtSearch->setText(QString("%1%2").arg(ui->mainEdtSearch->text()).arg(num)); ui->mainEdtSearch->setText(ui->mainEdtSearch->text().append(num));
} }
void MainForm::onBackInput() void MainForm::onNumDelete()
{ {
QString tmpStr = ui->mainEdtSearch->text(); QString text = ui->mainEdtSearch->text();
ui->mainEdtSearch->setText(tmpStr.mid(0, tmpStr.length()-1)); ui->mainEdtSearch->setText(text.left(text.length()-1));
} }
void MainForm::onCleanInput() void MainForm::onSearchResultItemClicked(QListWidgetItem *item)
{ {
ui->mainEdtSearch->setText(""); ui->mainEdtSearch->clear();
m_padForm->hide();
m_resultForm->hide();
emit getOrderDetails(item->text());
} }
fmTakeaway/mainForm.h
...@@ -9,11 +9,10 @@ ...@@ -9,11 +9,10 @@
#include "pickForm.h" #include "pickForm.h"
#include "settingForm.h" #include "settingForm.h"
#include "detailForm.h" #include "detailForm.h"
#include "DTools/sysTray.h"
#include "padForm.h"
#include <QListWidget>
#include <QTimer> #include <QTimer>
#include "Dclass/SysTray.h"
#include "Dclass/ClickedLineEdit.h"
#include "NumpadForm.h"
#include "SRForm.h"
namespace Ui { namespace Ui {
class MainForm; class MainForm;
...@@ -53,19 +52,20 @@ private: ...@@ -53,19 +52,20 @@ private:
SettingForm *m_settingForm; SettingForm *m_settingForm;
// 订单详情窗口 // 订单详情窗口
DetailForm *m_detailForm; DetailForm *m_detailForm;
// 数字键盘窗口
PadForm *m_padForm;
// 搜索结果窗口
QListWidget *m_resultForm;
// 当前选中的表 // 当前选中的表
QTableWidget *m_currentTable; QTableWidget *m_currentTable;
// 系统托盘
SysTray m_tray;
// 搜索键盘
NumpadForm *m_numpadForm;
// 搜索结果
SerachResultForm *m_srForm;
// 置顶计数器 // 置顶计数器
int m_raiseIndex; int m_raiseIndex;
// 托盘图标
SysTray m_tray;
/* 功能:还原按钮和表 /* 功能:还原按钮和表
* 参数:NULL * 参数:NULL
* 返回:NULL * 返回:NULL
...@@ -176,6 +176,26 @@ private slots: ...@@ -176,6 +176,26 @@ private slots:
* 返回:NULL * 返回:NULL
* */ * */
void onMainTableItemClicked(QTableWidgetItem *item); void onMainTableItemClicked(QTableWidgetItem *item);
/* 功能:点击搜索对应动作
* 参数:NULL
* 返回:NULL
* */
void on_mainEdtSearch_clicked();
/* 功能:键盘数字点击处理
* 参数:NULL
* 返回:NULL
* */
void onNumClicked(const QString& num);
/* 功能:键盘数字删除处理
* 参数:NULL
* 返回:NULL
* */
void onNumDelete();
/* 功能:点击搜索结果订单对应动作
* 参数:NULL
* 返回:NULL
* */
void onSearchResultItemClicked(QListWidgetItem * item);
public slots: public slots:
/* 功能:隐藏通知窗口 /* 功能:隐藏通知窗口
...@@ -228,22 +248,11 @@ public slots: ...@@ -228,22 +248,11 @@ public slots:
* 返回:NULL * 返回:NULL
* */ * */
void onShowOrderDetails(OrderObject* orderObject); void onShowOrderDetails(OrderObject* orderObject);
/* 功能:搜索框输入数字 /* 功能:显示订单搜索结果
* 参数:[1]按键数字 * 参数:[1]订单搜索结果
* 返回:NULL * 返回:NULL
* */ * */
void onInputNum(int num); void onShowSearchOrderResult(const QStringList& orderIdList);
/* 功能:搜索框删除一格
* 参数:NULL
* 返回:NULL
* */
void onBackInput();
/* 功能:搜索框清空数字
* 参数:NULL
* 返回:NULL
* */
void onCleanInput();
}; };
......
fmTakeaway/mainForm.ui
...@@ -1232,7 +1232,7 @@ ...@@ -1232,7 +1232,7 @@
<customwidget> <customwidget>
<class>ClickedLineEdit</class> <class>ClickedLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>DClass/ClickedLineEdit.h</header> <header>DTools/clickedlineedit.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
......
fmTakeaway/padForm.cpp 0 → 100644
#include "padForm.h"
#include "ui_padForm.h"
PadForm::PadForm(QWidget *parent) :
QDialog(parent),
ui(new Ui::PadForm)
{
ui->setupUi(this);
setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
}
PadForm::~PadForm()
{
delete ui;
}
void PadForm::onNumClicked()
{
QPushButton *btn = (QPushButton*)sender();
emit numClicked(btn->property("num").toString());
}
void PadForm::on_padBtnDel_clicked()
{
emit numDelete();
}
void PadForm::on_padBtnClose_clicked()
{
emit numClear();
hide();
}
fmTakeaway/padForm.h 0 → 100644
#ifndef PADFORM_H
#define PADFORM_H
#include <QDialog>
namespace Ui {
class PadForm;
}
class PadForm : public QDialog
{
Q_OBJECT
public:
explicit PadForm(QWidget *parent = 0);
~PadForm();
private:
Ui::PadForm *ui;
private slots:
/* 功能:数字点击对应操作
* 参数:NULL
* 返回:NULL
* */
void onNumClicked();
/* 功能:删除按钮对应操作
* 参数:NULL
* 返回:NULL
* */
void on_padBtnDel_clicked();
/* 功能:清空按钮对应操作
* 参数:NULL
* 返回:NULL
* */
void on_padBtnClose_clicked();
signals:
void numClicked(const QString& num);
void numDelete();
void numClear();
};
#endif // PADFORM_H
run/skin/deaufult.qrc
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
<file>detailFrm_bg2.png</file> <file>detailFrm_bg2.png</file>
<file>detailLab.png</file> <file>detailLab.png</file>
<file>takeaway.ico</file> <file>takeaway.ico</file>
<file>numpad_bg.png</file> <file>pad_bg.png</file>
<file>numpad_btn_123.png</file> <file>numBtn0.png</file>
<file>numpad_btn_456.png</file> <file>numBtn1.png</file>
<file>numpad_btn_7890.png</file> <file>numBtn2.png</file>
<file>numpad_btn_back_normal.png</file> <file>delBtn_normal.png</file>
<file>numpad_btn_back_press.png</file> <file>delBtn_press.png</file>
<file>notify_bg.png</file>
</qresource> </qresource>
</RCC> </RCC>
run/skin/deaufult.qss
...@@ -489,70 +489,6 @@ QWidget ...@@ -489,70 +489,6 @@ QWidget
height: 0px; height: 0px;
} }
/*---------------------------------DetailForm[ end ]---------------------------------*/ /*---------------------------------DetailForm[ end ]---------------------------------*/
/*---------------------------------NumpadForm[beigin]---------------------------------*/
#numpadWdg
{
border-image: url(:numpad_bg.png);
}
#numpadBtn1,#numpadBtn2,#numpadBtn3
{
font: 12pt "微软雅黑";
color: rgb(29, 29, 29);
border-image: url(:numpad_btn_123.png);
}
#numpadBtn4,#numpadBtn5,#numpadBtn6
{
font: 12pt "微软雅黑";
color: rgb(29, 29, 29);
border-image: url(:numpad_btn_456.png);
}
#numpadBtn7,#numpadBtn8,#numpadBtn9,#numpadBtn0,#numpadBtnCancle
{
font: 12pt "微软雅黑";
color: rgb(29, 29, 29);
border-image: url(:numpad_btn_7890.png);
}
#numpadBtnDel
{
border-image: url(:numpad_btn_back_normal.png);
}
#numpadBtn1:pressed,#numpadBtn2:pressed,#numpadBtn3:pressed
{
font: 12pt "微软雅黑";
color: rgb(230, 237, 225);
border-image: url(:numpad_btn_123.png);
}
#numpadBtn4:pressed,#numpadBtn5:pressed,#numpadBtn6:pressed
{
font: 12pt "微软雅黑";
color: rgb(230, 237, 225);
border-image: url(:numpad_btn_456.png);
}
#numpadBtn7:pressed,#numpadBtn8:pressed,#numpadBtn9:pressed,#numpadBtn0:pressed,#numpadBtnCancle:pressed
{
font: 12pt "微软雅黑";
color: rgb(230, 237, 225);
border-image: url(:numpad_btn_7890.png);
}
#numpadBtnDel:pressed
{
border-image: url(:numpad_btn_back_press.png);
}
/*---------------------------------NumpadForm[ end ]---------------------------------*/
/*---------------------------------SearchResultForm[beigin]---------------------------------*/
#searchResultWdg
{
border-image: url(:notify_bg.png);
}
#searchResultListWdg
{
color: rgb(90, 90, 90);
font: 13pt "微软雅黑";
}
/*---------------------------------SearchResultForm[ end ]---------------------------------*/
......
run/skin/make.bat
rcc -binary deaufult.qrc -o ..\..\..\build\takeaway-Debug\fmTakeaway\debug\skin\deaufult.rcc rcc -binary deaufult.qrc -o ..\..\..\build\takeaway-Debug\fmTakeaway\debug\skin\deaufult.rcc
pause
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