Skip to content

F
FmTakeaway
Commit d75fdea8 by ss.dai
Options

订单分类显示

parent 22459238
Showing with 641 additions and 165 deletions
fmTakeaway/Control/flowControl.cpp
...@@ -142,7 +142,7 @@ bool FlowControl::_pullOrder() ...@@ -142,7 +142,7 @@ bool FlowControl::_pullOrder()
} }
} }
QLOG_INFO() << QString("in order to pull %1 msec...").arg(syncTime); QLOG_INFO() << QString("%1 msec after pull order...").arg(syncTime);
QTimer::singleShot(syncTime, this, &FlowControl::_pullOrder); QTimer::singleShot(syncTime, this, &FlowControl::_pullOrder);
return result; return result;
......
fmTakeaway/DTools/configManger.cpp
...@@ -43,15 +43,5 @@ QUrl ConfigManger::GetServerUrl() ...@@ -43,15 +43,5 @@ QUrl ConfigManger::GetServerUrl()
return m_config->value(INI_SERVER).toUrl(); return m_config->value(INI_SERVER).toUrl();
} }
QString ConfigManger::GetStationId()
{
return m_config->value(INI_STATIONID).toString();
}
QString ConfigManger::GetCashierId()
{
return m_config->value(INI_CASHIERID).toString();
}
fmTakeaway/DTools/configManger.h
...@@ -34,16 +34,6 @@ public: ...@@ -34,16 +34,6 @@ public:
* 返回:服务器地址 * 返回:服务器地址
* */ * */
QUrl GetServerUrl(); QUrl GetServerUrl();
/* 功能:获取POS机编号
* 参数:NULL
* 返回:POS机编号
* */
QString GetStationId();
/* 功能:获取收银员编号
* 参数:NULL
* 返回:收银员编号
* */
QString GetCashierId();
private: private:
ConfigManger(); ConfigManger();
......
fmTakeaway/DTools/util.cpp 0 → 100644
#include "util.h"
QString Penny2Dollar(int penny)
{
double dollar = (double)penny/100;
return QString::number(dollar,'f',2);
}
fmTakeaway/DTools/util.h 0 → 100644
#ifndef UTIL_H
#define UTIL_H
#include <QString>
/* 功能:将【分】转化为【元】
* 参数:[1]分
* 返回:元
* */
QString Penny2Dollar(int penny);
#endif // UTIL_Hutil
fmTakeaway/Model/orderObject.cpp
...@@ -242,12 +242,12 @@ void OrderObject::setsend_fee(const int &v) ...@@ -242,12 +242,12 @@ void OrderObject::setsend_fee(const int &v)
} }
int OrderObject::gettotal_Amount() const int OrderObject::gettotal_Amount() const
{ {
return total_Amount; return total_amount;
} }
void OrderObject::settotal_Amount(const int &v) void OrderObject::settotal_Amount(const int &v)
{ {
total_Amount = v; total_amount = v;
} }
int OrderObject::getchannelNum() const int OrderObject::getchannelNum() const
......
fmTakeaway/Model/orderObject.h
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
Q_PROPERTY (int total_fee READ gettotal_fee WRITE settotal_fee) Q_PROPERTY (int total_fee READ gettotal_fee WRITE settotal_fee)
Q_PROPERTY (int discount_fee READ getdiscount_fee WRITE setdiscount_fee) Q_PROPERTY (int discount_fee READ getdiscount_fee WRITE setdiscount_fee)
Q_PROPERTY (int send_fee READ getsend_fee WRITE setsend_fee) Q_PROPERTY (int send_fee READ getsend_fee WRITE setsend_fee)
Q_PROPERTY (int total_Amount READ gettotal_Amount WRITE settotal_Amount) Q_PROPERTY (int total_amount READ gettotal_Amount WRITE settotal_Amount)
Q_PROPERTY (int channelNum READ getchannelNum WRITE setchannelNum) Q_PROPERTY (int channelNum READ getchannelNum WRITE setchannelNum)
Q_PROPERTY (int order_index READ getorder_index WRITE setorder_index) Q_PROPERTY (int order_index READ getorder_index WRITE setorder_index)
Q_PROPERTY (bool has_invoiced READ gethas_invoiced WRITE sethas_invoiced) Q_PROPERTY (bool has_invoiced READ gethas_invoiced WRITE sethas_invoiced)
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
int total_fee; //商品金额 int total_fee; //商品金额
int discount_fee; //商品优惠 int discount_fee; //商品优惠
int send_fee; //运费金额 int send_fee; //运费金额
int total_Amount; //总件数 int total_amount; //总件数
bool has_invoiced; //是否需要发票 bool has_invoiced; //是否需要发票
QString invoice_title; //发票抬头 QString invoice_title; //发票抬头
QString courier_name; //配送员信息 QString courier_name; //配送员信息
......
fmTakeaway/alertForm.cpp
...@@ -7,6 +7,8 @@ AlertForm::AlertForm(QWidget *parent) : ...@@ -7,6 +7,8 @@ AlertForm::AlertForm(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
qRegisterMetaType<AlertForm::Type>("AlertForm::Type");
_Init(); _Init();
} }
...@@ -48,7 +50,6 @@ void AlertForm::_Init() ...@@ -48,7 +50,6 @@ void AlertForm::_Init()
this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint); this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint);
this->setModal(true); this->setModal(true);
ui->alertBtnOk->setText(tr("确 定"));
ui->alertLabOk->hide(); ui->alertLabOk->hide();
ui->alertLabIng->hide(); ui->alertLabIng->hide();
ui->alertLabError->hide(); ui->alertLabError->hide();
......
fmTakeaway/alertForm.ui
...@@ -89,8 +89,11 @@ ...@@ -89,8 +89,11 @@
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text"> <property name="text">
<string/> <string>确 定</string>
</property> </property>
</widget> </widget>
</item> </item>
......
fmTakeaway/dbsetForm.cpp
...@@ -78,7 +78,6 @@ void DbsetForm::onConnectDbFinsh(bool bSuccess, const QString &error) ...@@ -78,7 +78,6 @@ void DbsetForm::onConnectDbFinsh(bool bSuccess, const QString &error)
void DbsetForm::on_dbsetBtnOk_clicked() void DbsetForm::on_dbsetBtnOk_clicked()
{ {
QLOG_TRACE() << __FUNCTION__;
ui->dbsetLabError->hide(); ui->dbsetLabError->hide();
if(ui->dbsetEdt0->text().isEmpty() || if(ui->dbsetEdt0->text().isEmpty() ||
......
fmTakeaway/fmTakeaway.pro
...@@ -26,7 +26,8 @@ SOURCES += main.cpp\ ...@@ -26,7 +26,8 @@ SOURCES += main.cpp\
Model/orderObject.cpp \ Model/orderObject.cpp \
Model/baseObject.cpp \ Model/baseObject.cpp \
Model/deliverObject.cpp \ Model/deliverObject.cpp \
Model/productObject.cpp Model/productObject.cpp \
DTools/util.cpp
HEADERS += \ HEADERS += \
mainForm.h \ mainForm.h \
...@@ -40,7 +41,8 @@ HEADERS += \ ...@@ -40,7 +41,8 @@ HEADERS += \
Model/orderObject.h \ Model/orderObject.h \
Model/baseObject.h \ Model/baseObject.h \
Model/deliverObject.h \ Model/deliverObject.h \
Model/productObject.h Model/productObject.h \
DTools/util.h
FORMS += mainForm.ui \ FORMS += mainForm.ui \
alertForm.ui \ alertForm.ui \
......
fmTakeaway/mainForm.cpp
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "preDefine.h" #include "preDefine.h"
#include "Control/flowControl.h" #include "Control/flowControl.h"
#include "QsLog.h" #include "QsLog.h"
#include "DTools/util.h"
MainForm::MainForm(QWidget *parent) : MainForm::MainForm(QWidget *parent) :
QDialog(parent), QDialog(parent),
...@@ -11,18 +12,27 @@ MainForm::MainForm(QWidget *parent) : ...@@ -11,18 +12,27 @@ MainForm::MainForm(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
// 初始化成员变量
m_prevBtn = NULL; m_prevBtn = NULL;
m_prevTable = NULL; m_prevTable = NULL;
m_alertForm = new AlertForm(this); m_alertForm = new AlertForm(this);
m_tableList.append(ui->mainTableNew);
m_tableList.append(ui->mainTableMake);
m_tableList.append(ui->mainTableSend);
m_tableList.append(ui->mainTableRefund);
m_tableList.append(ui->mainTableFinsh);
m_tableList.append(ui->mainTableOther);
// 连接信号槽
connect(this, &MainForm::flowStart, &FlowControl::GetInstance(), &FlowControl::onFlowStart); connect(this, &MainForm::flowStart, &FlowControl::GetInstance(), &FlowControl::onFlowStart);
connect(&FlowControl::GetInstance(), &FlowControl::hideAlert, this, &MainForm::onHideAlert); connect(&FlowControl::GetInstance(), &FlowControl::hideAlert, this, &MainForm::onHideAlert);
qRegisterMetaType<AlertForm::Type>("AlertForm::Type");
connect(&FlowControl::GetInstance(), &FlowControl::showAlert, this, &MainForm::onShowAlert); connect(&FlowControl::GetInstance(), &FlowControl::showAlert, this, &MainForm::onShowAlert);
connect(&FlowControl::GetInstance(), &FlowControl::setOpeStatus, this, &MainForm::onSetOpeStatus); connect(&FlowControl::GetInstance(), &FlowControl::setOpeStatus, this, &MainForm::onSetOpeStatus);
connect(&FlowControl::GetInstance(), &FlowControl::setNetStatus, this, &MainForm::onSetNetStatus); connect(&FlowControl::GetInstance(), &FlowControl::setNetStatus, this, &MainForm::onSetNetStatus);
connect(&FlowControl::GetInstance(), &FlowControl::setStoreInfo, this, &MainForm::onSetStoreInfo); connect(&FlowControl::GetInstance(), &FlowControl::setStoreInfo, this, &MainForm::onSetStoreInfo);
connect(&FlowControl::GetInstance(), &FlowControl::changeOrderStatus, this, &MainForm::onChangeOrderStatus); connect(&FlowControl::GetInstance(), &FlowControl::changeOrderStatus, this, &MainForm::onChangeOrderStatus);
// 初始化界面
_Init(); _Init();
} }
...@@ -40,35 +50,37 @@ void MainForm::MyShow() ...@@ -40,35 +50,37 @@ void MainForm::MyShow()
void MainForm::_Init() void MainForm::_Init()
{ {
this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint); this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint/* | Qt::WindowStaysOnTopHint*/);
// 初始化文字
ui->mainBtnNew->setText(tr("新订单"));
ui->mainBtnMake->setText(tr("制作中"));
ui->mainBtnSend->setText(tr("配送中"));
ui->mainBtnFinsh->setText(tr("已完成"));
ui->mainBtnRefund->setText(tr("需退款"));
ui->mainBtnOther->setText(tr("其他"));
ui->mainBtnHide->setText(tr("隐藏"));
ui->mainBtnSet->setText(tr("设置"));
ui->mainSlabStoreid->setText(tr("门店号:"));
ui->mainLabStoreid->setText(UI_STOREID); ui->mainLabStoreid->setText(UI_STOREID);
ui->mainSlabOpeStatus->setText(tr("门店营业状态:"));
ui->mainSlabNetStatus->setText(tr("门店网络状态:"));
ui->mainBtnOpeDetails->setText(tr("详情"));
ui->mainSlabVersion->setText(tr("版本号:"));
ui->mainLabVersion->setText(APP_VERSION); ui->mainLabVersion->setText(APP_VERSION);
ui->mainSlabCashier->setText(tr("收银员:"));
ui->mainLabCashier->setText(UI_CASHIER); ui->mainLabCashier->setText(UI_CASHIER);
ui->mainBtnCashier->setText(tr("选择收银员"));
ui->mainEdtSerach->setPlaceholderText(tr("输入订单号"));
ui->mainTableNew->hide();
ui->mainTableMake->hide();
ui->mainTableSend->hide();
ui->mainTableFinsh->hide();
ui->mainTableRefund->hide();
ui->mainTableOther->hide();
// 初始化表
int scales6[] = {3, 4, 2, 3, 3, 3};
int scales5[] = {3, 6, 2, 3, 4};
int tableWidth = this->width() - 70;
foreach(QTableWidget *table, m_tableList)
{
table->hide();
if(table == ui->mainTableFinsh ||
table == ui->mainTableOther)
{
for(int i=0; i<5; i++)
{
table->setColumnWidth(i, tableWidth*scales5[i]/21);
}
}else
{
for(int i=0; i<6; i++)
{
table->setColumnWidth(i, tableWidth*scales6[i]/21);
}
}
}
// 默认选中【新订单】
ui->mainTableNew->show(); ui->mainTableNew->show();
ui->mainBtnNew->setChecked(true); ui->mainBtnNew->setChecked(true);
ui->mainBtnNew->setEnabled(false); ui->mainBtnNew->setEnabled(false);
...@@ -76,88 +88,60 @@ void MainForm::_Init() ...@@ -76,88 +88,60 @@ void MainForm::_Init()
m_prevTable = ui->mainTableNew; m_prevTable = ui->mainTableNew;
} }
void MainForm::_RevertBtnTable() void MainForm::onMainTabBtnClicked()
{
m_prevBtn->setChecked(false);
m_prevBtn->setEnabled(true);
m_prevTable->hide();
}
void MainForm::on_mainBtnNew_clicked()
{ {
_RevertBtnTable(); _RevertBtnTable();
QPushButton *btn = (QPushButton*)sender();
QTableWidget *table = findChild<QTableWidget*>(btn->property("tableName").toString());
ui->mainTableNew->show(); table->show();
ui->mainBtnNew->setChecked(true); btn->setChecked(true);
ui->mainBtnNew->setEnabled(false); btn->setEnabled(false);
m_prevBtn = ui->mainBtnNew; m_prevBtn = btn;
m_prevTable = ui->mainTableNew; m_prevTable = table;
}
void MainForm::on_mainBtnMake_clicked()
{
_RevertBtnTable();
ui->mainTableMake->show();
ui->mainBtnMake->setChecked(true);
ui->mainBtnMake->setEnabled(false);
m_prevBtn = ui->mainBtnMake;
m_prevTable = ui->mainTableMake;
} }
void MainForm::on_mainBtnSend_clicked() void MainForm::_RevertBtnTable()
{
_RevertBtnTable();
ui->mainTableSend->show();
ui->mainBtnSend->setChecked(true);
ui->mainBtnSend->setEnabled(false);
m_prevBtn = ui->mainBtnSend;
m_prevTable = ui->mainTableSend;
}
void MainForm::on_mainBtnFinsh_clicked()
{
_RevertBtnTable();
ui->mainTableFinsh->show();
ui->mainBtnFinsh->setChecked(true);
ui->mainBtnFinsh->setEnabled(false);
m_prevBtn = ui->mainBtnFinsh;
m_prevTable = ui->mainTableFinsh;
}
void MainForm::on_mainBtnRefund_clicked()
{
_RevertBtnTable();
ui->mainTableRefund->show();
ui->mainBtnRefund->setChecked(true);
ui->mainBtnRefund->setEnabled(false);
m_prevBtn = ui->mainBtnRefund;
m_prevTable = ui->mainTableRefund;
}
void MainForm::on_mainBtnOther_clicked()
{ {
_RevertBtnTable(); m_prevBtn->setChecked(false);
m_prevBtn->setEnabled(true);
ui->mainTableOther->show(); m_prevTable->hide();
ui->mainBtnOther->setChecked(true);
ui->mainBtnOther->setEnabled(false);
m_prevBtn = ui->mainBtnOther;
m_prevTable = ui->mainTableOther;
} }
void MainForm::on_mainBtnOpeDetails_clicked() void MainForm::_SetTablesSortEnable(bool bEnable)
{ {
foreach (QTableWidget *table, m_tableList)
{
table->setSortingEnabled(bEnable);
}
}
QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus)
{
switch(orderStatus)
{
case 1:
return ui->mainBtnNew;
break;
case 2:
return ui->mainBtnMake;
break;
case 5:
case 4:
return ui->mainBtnSend;
break;
case 6:
case 200:
return ui->mainBtnFinsh;
break;
case 20:
return ui->mainBtnRefund;
break;
default:
return ui->mainBtnOther;
break;
}
} }
void MainForm::onHideAlert() void MainForm::onHideAlert()
...@@ -188,5 +172,66 @@ void MainForm::onSetNetStatus(const QString &status) ...@@ -188,5 +172,66 @@ void MainForm::onSetNetStatus(const QString &status)
void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus) void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
{ {
_SetTablesSortEnable(false);
QTableWidget *table;
QPushButton *tabBtn;
// 非首次收到的订单需要现在原先表中删除
if(oldStatus != -100)
{
tabBtn = _GetTabBtnByOrderStatus(oldStatus);
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
for(int i=0; i<table->rowCount(); i++)
{
if(!table->item(i, 1)->text().compare(orderObject->order_id))
{
table->removeRow(i);
QString btnText(tabBtn->property("name").toString());
if(table->rowCount() != 0)
{
btnText = QString("%1(%2)").arg(btnText).arg(table->rowCount());
}
tabBtn->setText(btnText);
}
}
}
tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
table->insertRow(0);
QTableWidgetItem *item0 = new QTableWidgetItem(orderObject->channelName);
item0->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 0, item0); // 渠道
QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->order_id);
item1->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 1, item1); // 订单ID
QTableWidgetItem *item2 = new QTableWidgetItem(Penny2Dollar(orderObject->shop_fee));
item2->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 2, item2); // 金额
QTableWidgetItem *item3 = new QTableWidgetItem(orderObject->customer);
item3->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 3, item3); // 姓名
QTableWidgetItem *item4 = new QTableWidgetItem(orderObject->phone);
item4->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 4, item4); // 联系方式
QTableWidgetItem *item5 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject->create_time).toString("MM-dd hh:mm"));
item5->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 5, item5); // 下单时间
if(table != ui->mainTableFinsh && table != ui->mainTableOther)
{
QWidget *pWdg = new QWidget(table);
QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
QPushButton * pBtn = new QPushButton(pWdg);
pBtn->setFocusPolicy(Qt::NoFocus);
pBtn->setObjectName("mainOperaBtnInTable");
pBtn->setText(tabBtn->property("operationName").toString());
hLayout->addWidget(pBtn);
hLayout->setMargin(0);
pWdg->setLayout(hLayout);
table->setCellWidget(0, 6, pWdg);
} // 操作
QString btnText = QString("%1(%2)").arg(tabBtn->property("name").toString()).arg(table->rowCount());
tabBtn->setText(btnText);
_SetTablesSortEnable(true);
} }
fmTakeaway/mainForm.h
...@@ -30,6 +30,8 @@ private: ...@@ -30,6 +30,8 @@ private:
// 记录上一次选中的表单和按钮 // 记录上一次选中的表单和按钮
QPushButton *m_prevBtn; QPushButton *m_prevBtn;
QTableWidget *m_prevTable; QTableWidget *m_prevTable;
// 所有的表
QList<QTableWidget*> m_tableList;
// 通知窗口 // 通知窗口
AlertForm *m_alertForm; AlertForm *m_alertForm;
...@@ -39,6 +41,16 @@ private: ...@@ -39,6 +41,16 @@ private:
* 返回:NULL * 返回:NULL
* */ * */
void _RevertBtnTable(); void _RevertBtnTable();
/* 功能:控制Table的排序
* 参数:[1]是否开启排序
* 返回:NULL
* */
void _SetTablesSortEnable(bool bEnable);
/* 功能:根据订单状态获取对应的Tab按钮
* 参数:[1]订单状态
* 返回:对应的Tab按钮
* */
QPushButton *_GetTabBtnByOrderStatus(int orderStatus);
signals: signals:
/* 功能:开启流程控制器 /* 功能:开启流程控制器
...@@ -53,14 +65,11 @@ private slots: ...@@ -53,14 +65,11 @@ private slots:
* 返回:NULL * 返回:NULL
* */ * */
void _Init(); void _Init();
// 功能:按钮点击对应操作 /* 功能:Tab页按钮点击对应动作
void on_mainBtnNew_clicked(); * 参数:NULL
void on_mainBtnMake_clicked(); * 返回:NULL
void on_mainBtnSend_clicked(); * */
void on_mainBtnFinsh_clicked(); void onMainTabBtnClicked();
void on_mainBtnRefund_clicked();
void on_mainBtnOther_clicked();
void on_mainBtnOpeDetails_clicked();
public slots: public slots:
/* 功能:隐藏通知窗口 /* 功能:隐藏通知窗口
......
fmTakeaway/mainForm.ui
...@@ -72,11 +72,20 @@ ...@@ -72,11 +72,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>新订单</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableNew</string>
</property>
<property name="name" stdset="0">
<string>新订单</string>
</property>
<property name="operationName" stdset="0">
<string>接单</string>
</property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnMake"> <widget class="QPushButton" name="mainBtnMake">
<property name="geometry"> <property name="geometry">
...@@ -91,11 +100,20 @@ ...@@ -91,11 +100,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>制作中</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableMake</string>
</property>
<property name="name" stdset="0">
<string>制作中</string>
</property>
<property name="operationName" stdset="0">
<string>送出</string>
</property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnSend"> <widget class="QPushButton" name="mainBtnSend">
<property name="geometry"> <property name="geometry">
...@@ -110,11 +128,20 @@ ...@@ -110,11 +128,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>配送中</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableSend</string>
</property>
<property name="name" stdset="0">
<string>配送中</string>
</property>
<property name="operationName" stdset="0">
<string>完成</string>
</property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnFinsh"> <widget class="QPushButton" name="mainBtnFinsh">
<property name="geometry"> <property name="geometry">
...@@ -129,11 +156,20 @@ ...@@ -129,11 +156,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>已完成</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableFinsh</string>
</property>
<property name="name" stdset="0">
<string>已完成</string>
</property>
<property name="operationName" stdset="0">
<string>NULL</string>
</property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnRefund"> <widget class="QPushButton" name="mainBtnRefund">
<property name="geometry"> <property name="geometry">
...@@ -148,11 +184,20 @@ ...@@ -148,11 +184,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>需退单</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableRefund</string>
</property>
<property name="name" stdset="0">
<string>需退单</string>
</property>
<property name="operationName" stdset="0">
<string>退单</string>
</property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnOther"> <widget class="QPushButton" name="mainBtnOther">
<property name="geometry"> <property name="geometry">
...@@ -167,11 +212,20 @@ ...@@ -167,11 +212,20 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>其他</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0">
<string>mainTableOther</string>
</property>
<property name="name" stdset="0">
<string>其他</string>
</property>
<property name="operationName" stdset="0">
<string>NULL</string>
</property>
</widget> </widget>
<widget class="QLabel" name="mainSlabLogo"> <widget class="QLabel" name="mainSlabLogo">
<property name="geometry"> <property name="geometry">
...@@ -207,7 +261,7 @@ ...@@ -207,7 +261,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>隐藏</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -217,7 +271,7 @@ ...@@ -217,7 +271,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>设置</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -244,22 +298,282 @@ ...@@ -244,22 +298,282 @@
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_10"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QTableWidget" name="mainTableNew"/> <widget class="QTableWidget" name="mainTableNew">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
<column>
<property name="text">
<string>操作</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableMake"/> <widget class="QTableWidget" name="mainTableMake">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
<column>
<property name="text">
<string>操作</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableSend"/> <widget class="QTableWidget" name="mainTableSend">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
<column>
<property name="text">
<string>操作</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableFinsh"/> <widget class="QTableWidget" name="mainTableFinsh">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableRefund"/> <widget class="QTableWidget" name="mainTableRefund">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
<column>
<property name="text">
<string>操作</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableOther"/> <widget class="QTableWidget" name="mainTableOther">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>渠道</string>
</property>
</column>
<column>
<property name="text">
<string>订单编号</string>
</property>
</column>
<column>
<property name="text">
<string>金额</string>
</property>
</column>
<column>
<property name="text">
<string>姓名</string>
</property>
</column>
<column>
<property name="text">
<string>联系方式</string>
</property>
</column>
<column>
<property name="text">
<string>下单时间</string>
</property>
</column>
</widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
...@@ -373,6 +687,9 @@ ...@@ -373,6 +687,9 @@
<property name="frame"> <property name="frame">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="placeholderText">
<string>输入订单号</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -411,7 +728,7 @@ ...@@ -411,7 +728,7 @@
<item> <item>
<widget class="QLabel" name="mainSlabStoreid"> <widget class="QLabel" name="mainSlabStoreid">
<property name="text"> <property name="text">
<string/> <string>门店编号:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -429,7 +746,7 @@ ...@@ -429,7 +746,7 @@
<item> <item>
<widget class="QLabel" name="mainSlabOpeStatus"> <widget class="QLabel" name="mainSlabOpeStatus">
<property name="text"> <property name="text">
<string/> <string>营业状态:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -442,8 +759,11 @@ ...@@ -442,8 +759,11 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="mainBtnOpeDetails"> <widget class="QPushButton" name="mainBtnOpeDetails">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text"> <property name="text">
<string/> <string>详情</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -454,7 +774,7 @@ ...@@ -454,7 +774,7 @@
<item> <item>
<widget class="QLabel" name="mainSlabNetStatus"> <widget class="QLabel" name="mainSlabNetStatus">
<property name="text"> <property name="text">
<string/> <string>网络状态:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -479,7 +799,7 @@ ...@@ -479,7 +799,7 @@
<item> <item>
<widget class="QLabel" name="mainSlabVersion"> <widget class="QLabel" name="mainSlabVersion">
<property name="text"> <property name="text">
<string/> <string>软件版本:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -497,7 +817,7 @@ ...@@ -497,7 +817,7 @@
<item> <item>
<widget class="QLabel" name="mainSlabCashier"> <widget class="QLabel" name="mainSlabCashier">
<property name="text"> <property name="text">
<string/> <string>收银员:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -518,7 +838,7 @@ ...@@ -518,7 +838,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>选择收银员</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -532,5 +852,105 @@ ...@@ -532,5 +852,105 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources/> <resources/>
<connections/> <connections>
<connection>
<sender>mainBtnNew</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>47</x>
<y>50</y>
</hint>
<hint type="destinationlabel">
<x>45</x>
<y>-49</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnMake</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>115</x>
<y>55</y>
</hint>
<hint type="destinationlabel">
<x>113</x>
<y>-24</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnSend</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>170</x>
<y>61</y>
</hint>
<hint type="destinationlabel">
<x>159</x>
<y>-39</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnFinsh</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>234</x>
<y>53</y>
</hint>
<hint type="destinationlabel">
<x>221</x>
<y>-34</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnRefund</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>300</x>
<y>58</y>
</hint>
<hint type="destinationlabel">
<x>289</x>
<y>-63</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnOther</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>357</x>
<y>60</y>
</hint>
<hint type="destinationlabel">
<x>348</x>
<y>-50</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>onMainTabBtnClicked()</slot>
</slots>
</ui> </ui>
fmTakeaway/preDefine.h
...@@ -9,16 +9,14 @@ ...@@ -9,16 +9,14 @@
#define CONFIG_NAME "config.ini" #define CONFIG_NAME "config.ini"
#define USERCONFIG_NAME "userConfig.ini" #define USERCONFIG_NAME "userConfig.ini"
#define UI_CASHIER "未选择" #define UI_CASHIER "<font color='#ff0000'>未选择</font>"
#define UI_STOREID "未登录" #define UI_STOREID "<font color='#ff0000'>未登录</font>"
#define INI_HOST "SqlServer/host" #define INI_HOST "SqlServer/host"
#define INI_USERNAME "SqlServer/username" #define INI_USERNAME "SqlServer/username"
#define INI_PASSWORD "SqlServer/password" #define INI_PASSWORD "SqlServer/password"
#define INI_DATABASE "SqlServer/database" #define INI_DATABASE "SqlServer/database"
#define INI_SERVER "FmServer/url" #define INI_SERVER "FmServer/url"
#define INI_STATIONID "Login/stationid"
#define INI_CASHIERID "Login/cashierid"
#define JSON_REQTYPE "reqtype" #define JSON_REQTYPE "reqtype"
#define JSON_CURRENTUSER "current_user" #define JSON_CURRENTUSER "current_user"
......
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