Skip to content

F
fmTakeaway-WDM
Commit a6a47672 by 戴尚尚
Options

提交

parent 1fce268e
Showing with 404 additions and 155 deletions
fmPrinter/fmPrinter.cpp
#include "fmPrinter.h" #include "fmPrinter.h"
#include <QFile> #include <QFile>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDateTime> #include <QDateTime>
...@@ -71,7 +71,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData) ...@@ -71,7 +71,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
if( !pObj->sub_products.isEmpty() ) if( !pObj->sub_products.isEmpty() )
{ {
str_comd_list.append(QString(">>>>>>#")); str_comd_list.append(QString(">>>>>>#"));
str_comd_list.append(QString("[套餐名]"+pObj->name+"#"));
QString price = QString("%1 x%2 %3").arg(_Penny2Dollar(pObj->price)).arg(pObj->productAmount)
.arg(_Penny2Dollar(pObj->price*pObj->productAmount));
str_comd_list.append(QString("[套餐名]" + pObj->name + "#" + price + "#"));
foreach(ProductObject *sun_pObj, pObj->sub_products) foreach(ProductObject *sun_pObj, pObj->sub_products)
{ {
QString name, price; QString name, price;
...@@ -117,7 +121,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData) ...@@ -117,7 +121,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
result_str.append("|"); result_str.append("|");
result_str.append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达"); result_str.append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达");
result_str.append("|"); result_str.append("|");
result_str.append(pData->remark.isEmpty()?"null":pData->remark.replace("\r\n", "")); result_str.append(pData->remark.isEmpty()?"null":pData->remark.replace("\r\n", "").replace("|", "").replace("#", ""));
result_str.append("|"); result_str.append("|");
result_str.append(pData->has_invoiced?"是": "null"); result_str.append(pData->has_invoiced?"是": "null");
...@@ -148,7 +152,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData) ...@@ -148,7 +152,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
result_str.append("|"); result_str.append("|");
result_str.append(_Penny2Dollar(pData->send_fee)); result_str.append(_Penny2Dollar(pData->send_fee));
result_str.append("|"); result_str.append("|");
result_str.append(_Penny2Dollar(pData->total_fee)); // 订单总金额 result_str.append(_Penny2Dollar(!pData->channelName.compare("非码微店") ? pData->total_fee-pData->dis_shop_fee : pData->total_fee)); // 订单总金额
result_str.append("|"); result_str.append("|");
// 减去商家优惠金额 // 减去商家优惠金额
......
fmTakeaway/Control/flowControl.cpp
#include "flowControl.h" #include "flowControl.h"
#include "fmPlugin.h" #include "fmPlugin.h"
#include "fmPrinter.h" #include "fmPrinter.h"
#include "QsLog.h" #include "QsLog.h"
...@@ -221,6 +221,7 @@ bool FlowControl::_PullOrder() ...@@ -221,6 +221,7 @@ bool FlowControl::_PullOrder()
{ {
//新数据 //新数据
orderObject = new OrderObject(this); orderObject = new OrderObject(this);
orderObject->FromJson(jsonObject); orderObject->FromJson(jsonObject);
if(QDateTime::fromTime_t(orderObject->create_time).date() == QDate::currentDate() if(QDateTime::fromTime_t(orderObject->create_time).date() == QDate::currentDate()
|| ((orderObject->order_type == 2) && (orderObject->status != 6)) ) || ((orderObject->order_type == 2) && (orderObject->status != 6)) )
...@@ -276,10 +277,10 @@ bool FlowControl::_PullOrder() ...@@ -276,10 +277,10 @@ bool FlowControl::_PullOrder()
.arg(orderObject->order_id, orderObject->status_desc) .arg(orderObject->order_id, orderObject->status_desc)
.arg(_GetJsonStr(jsonObject)); .arg(_GetJsonStr(jsonObject));
if(oldStatus != orderObject->status) //if(oldStatus != orderObject->status)
{ //{
emit changeOrderStatus(orderObject, oldStatus); emit changeOrderStatus(orderObject, oldStatus);
} //}
if(orderObject->delivery_status==2 && orderObject->status==2) if(orderObject->delivery_status==2 && orderObject->status==2)
{ {
...@@ -311,7 +312,7 @@ bool FlowControl::_PullOrder() ...@@ -311,7 +312,7 @@ bool FlowControl::_PullOrder()
if(orderObject->status == 22 && orderObject->refundProList.isEmpty()) if(orderObject->refund_status == 22 && orderObject->refundProList.isEmpty())
{ {
QString error; QString error;
bool result; bool result;
...@@ -322,8 +323,9 @@ bool FlowControl::_PullOrder() ...@@ -322,8 +323,9 @@ bool FlowControl::_PullOrder()
QLOG_INFO() << QString("[---get refundDetail---][requestData:%1]").arg(_GetJsonStr(sendJson)); QLOG_INFO() << QString("[---get refundDetail---][requestData:%1]").arg(_GetJsonStr(sendJson));
result = m_pullOrderSocket->Request(sendJson, recvJson, error); result = m_pullOrderSocket->Request(sendJson, recvJson, error);
QLOG_INFO() << QString("get refundDetail finsh. [result:%1][msg:%2]") QLOG_INFO() << QString("get refundDetail finsh. [result:%1][msg:%2][recvJson:%3]")
.arg(result).arg(error); .arg(result).arg(error).arg(_GetJsonStr(recvJson));
if( recvJson["statusCode"].toInt() == 100 ) if( recvJson["statusCode"].toInt() == 100 )
{ {
QJsonArray items = recvJson["refund_info"].toObject()["refund_items"].toArray(); QJsonArray items = recvJson["refund_info"].toObject()["refund_items"].toArray();
......
fmTakeaway/DTools/util.cpp
#include "util.h" #include "util.h"
#include "preDefine.h" #include "preDefine.h"
QString Penny2Dollar(int penny) QString Penny2Dollar(int penny)
...@@ -7,8 +7,12 @@ QString Penny2Dollar(int penny) ...@@ -7,8 +7,12 @@ QString Penny2Dollar(int penny)
return QString::number(dollar,'f',2); return QString::number(dollar,'f',2);
} }
QString GetOperByStatus(int status) QString GetOperByStatus(int status, int refundStatus)
{ {
if(refundStatus == 20 || refundStatus == 22)
{
return OPERATION_AGREEREFUND;
}
switch(status) switch(status)
{ {
case 1: case 1:
...@@ -35,8 +39,12 @@ QString GetOperByStatus(int status) ...@@ -35,8 +39,12 @@ QString GetOperByStatus(int status)
} }
} }
QString GetOperNameByStatus(int status) QString GetOperNameByStatus(int status, int refundStatus)
{ {
if(refundStatus == 20 || refundStatus == 22)
{
return OPERATIONNAME_AGREEREFUND;
}
switch(status) switch(status)
{ {
case 1: case 1:
......
fmTakeaway/DTools/util.h
#ifndef UTIL_H #ifndef UTIL_H
#define UTIL_H #define UTIL_H
#include <QString> #include <QString>
...@@ -12,11 +12,11 @@ QString Penny2Dollar(int penny); ...@@ -12,11 +12,11 @@ QString Penny2Dollar(int penny);
* 参数:[1]订单状态 * 参数:[1]订单状态
* 返回:元 * 返回:元
* */ * */
QString GetOperByStatus(int status); QString GetOperByStatus(int status, int refundStatus);
/* 功能:根据订单状态获取操作名 /* 功能:根据订单状态获取操作名
* 参数:[1]订单状态 * 参数:[1]订单状态
* 返回:元 * 返回:元
* */ * */
QString GetOperNameByStatus(int status); QString GetOperNameByStatus(int status, int refundStatus);
#endif // UTIL_Hutil #endif // UTIL_Hutil
fmTakeaway/Model/orderObject.cpp
#include "orderObject.h" #include "orderObject.h"
#include "preDefine.h" #include "preDefine.h"
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
...@@ -34,6 +34,16 @@ QString OrderObject::toString() ...@@ -34,6 +34,16 @@ QString OrderObject::toString()
return QString(QJsonDocument(json).toJson().simplified()); return QString(QJsonDocument(json).toJson().simplified());
} }
int OrderObject::getrefund_status() const
{
return refund_status;
}
void OrderObject::setrefund_status(const int &v)
{
refund_status = v;
}
int OrderObject::getpackage_fee() const int OrderObject::getpackage_fee() const
{ {
return package_fee; return package_fee;
......
fmTakeaway/Model/orderObject.h
#ifndef ORDEROBJECT_H #ifndef ORDEROBJECT_H
#define ORDEROBJECT_H #define ORDEROBJECT_H
#include "productObject.h" #include "productObject.h"
...@@ -64,6 +64,7 @@ public: ...@@ -64,6 +64,7 @@ public:
Q_PROPERTY (QString order_view_id READ getorder_view_id WRITE setorder_view_id) Q_PROPERTY (QString order_view_id READ getorder_view_id WRITE setorder_view_id)
Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type) Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type)
Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee) Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee)
Q_PROPERTY (int refund_status READ getrefund_status WRITE setrefund_status)
QString order_view_id; //用户看到的订单ＩＤ QString order_view_id; //用户看到的订单ＩＤ
QString address; //地址 QString address; //地址
...@@ -98,6 +99,7 @@ public: ...@@ -98,6 +99,7 @@ public:
int rest_fee; //未付 int rest_fee; //未付
QString status_desc; //订单状态描述 QString status_desc; //订单状态描述
int status; //订单状态 int status; //订单状态
int refund_status; //退款状态
int shop_fee; //应收金额(商家和骑士看到的) int shop_fee; //应收金额(商家和骑士看到的)
int send_fee; //运费金额 int send_fee; //运费金额
QString timestamp; //时间戳 QString timestamp; //时间戳
...@@ -118,6 +120,11 @@ public: ...@@ -118,6 +120,11 @@ public:
QPushButton* curt_table_btn; //当前订单所在表对应的按钮 QPushButton* curt_table_btn; //当前订单所在表对应的按钮
protected: protected:
int getrefund_status() const ;
void setrefund_status(const int& v);
int getpackage_fee() const ; int getpackage_fee() const ;
void setpackage_fee(const int& v); void setpackage_fee(const int& v);
......
fmTakeaway/dailyform.cpp
#include "dailyform.h" #include "dailyform.h"
#include "ui_dailyform.h" #include "ui_dailyform.h"
#include "fmPrinter.h" #include "fmPrinter.h"
#include "DTools/configManger.h" #include "DTools/configManger.h"
...@@ -18,7 +18,7 @@ DailyForm::DailyForm(QWidget *parent) : ...@@ -18,7 +18,7 @@ DailyForm::DailyForm(QWidget *parent) :
m_map.insert("bdwm", "百度外卖"); m_map.insert("bdwm", "百度外卖");
m_map.insert("jdwm", "京东到家"); m_map.insert("jdwm", "京东到家");
m_map.insert("eleme2", "饿了么 "); m_map.insert("eleme2", "饿了么 ");
m_map.insert("fmwd", "非码微店"); m_map.insert("fmwd", "官网");
m_map.insert("mall", "APP "); m_map.insert("mall", "APP ");
ui->daily_table0->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); ui->daily_table0->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
......
fmTakeaway/detailForm.cpp
#include "detailForm.h" #include "detailForm.h"
#include "ui_detailForm.h" #include "ui_detailForm.h"
#include "DTools/util.h" #include "DTools/util.h"
#include "preDefine.h" #include "preDefine.h"
...@@ -60,7 +60,7 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -60,7 +60,7 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票"); ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票");
ui->detailLab9->setPixmap(Code39().getCode39Map(orderObject->order_id)); // 条码 ui->detailLab9->setPixmap(Code39().getCode39Map(orderObject->order_id)); // 条码
ui->detailLab10->setText(QString("-")+Penny2Dollar(orderObject->service_fee)); ui->detailLab10->setText(QString("-")+Penny2Dollar(orderObject->service_fee));
ui->detailLab11->setText(QString("-")+Penny2Dollar(orderObject->dis_shop_fee+orderObject->service_fee)); ui->detailLab11->setText("0");
for(int i=0; i<orderObject->proList.count(); i++) for(int i=0; i<orderObject->proList.count(); i++)
{ {
...@@ -112,17 +112,18 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -112,17 +112,18 @@ void DetailForm::InitData(OrderObject *orderObject)
{ {
ui->detailBtn2->hide(); ui->detailBtn2->hide();
} }
if(orderObject->status==20||orderObject->status ==22) if(orderObject->refund_status==20||orderObject->refund_status ==22)
{ {
ui->detailBtn2->hide(); ui->detailBtn2->hide();
} }
if(orderObject->status==20) if(orderObject->refund_status==20)
{ {
ui->detailLabNotice->setText("该订单为全额退款"); ui->detailLabNotice->setText("该订单为全额退款");
ui->detailLab11->setText("全额退款");
} }
if(orderObject->status==22) if(orderObject->refund_status==22)
{ {
ui->detailLabNotice->setText("该订单为部分退款"); ui->detailLabNotice->setText("该订单为部分退款");
...@@ -131,6 +132,8 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -131,6 +132,8 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailTable0->setItem(count,0,new QTableWidgetItem(QString("退款商品"))); ui->detailTable0->setItem(count,0,new QTableWidgetItem(QString("退款商品")));
ui->detailTable0->item(count, 0)->setTextAlignment(Qt::AlignCenter); ui->detailTable0->item(count, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailLab11->setText(Penny2Dollar(orderObject->refund_total_fee));
for(int i=0; i<orderObject->refundProList.count(); i++) for(int i=0; i<orderObject->refundProList.count(); i++)
{ {
int row = i+count+1; int row = i+count+1;
...@@ -147,17 +150,17 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -147,17 +150,17 @@ void DetailForm::InitData(OrderObject *orderObject)
} }
} }
ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status)); ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status, orderObject->refund_status));
ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status)); ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status, orderObject->refund_status));
ui->detailBtn3->setProperty("orderId", orderObject->order_id); ui->detailBtn3->setProperty("orderId", orderObject->order_id);
if(orderObject->status==2 || orderObject->status==4) if((orderObject->status==2 || orderObject->status==4) && (orderObject->refund_status != 20) && (orderObject->refund_status != 22))
{ {
ui->detailBtn3->hide(); ui->detailBtn3->hide();
} }
if(!GetOperByStatus(orderObject->status).compare("NULL")) if(!GetOperByStatus(orderObject->status, orderObject->refund_status).compare("NULL"))
{ {
ui->detailBtn3->hide(); ui->detailBtn3->hide();
} }
......
fmTakeaway/detailForm.ui
...@@ -24,6 +24,14 @@ ...@@ -24,6 +24,14 @@
<layout class="QHBoxLayout" name="horizontalLayout_17"> <layout class="QHBoxLayout" name="horizontalLayout_17">
<item> <item>
<widget class="QLabel" name="detailLabNotice"> <widget class="QLabel" name="detailLabNotice">
<property name="font">
<font>
<pointsize>13</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -995,7 +1003,7 @@ ...@@ -995,7 +1003,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>合计:</string> <string>退款金额:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
......
fmTakeaway/mainForm.cpp
#include "mainForm.h" #include "mainForm.h"
#include "QsLog.h" #include "QsLog.h"
#include "ui_mainForm.h" #include "ui_mainForm.h"
#include "preDefine.h" #include "preDefine.h"
...@@ -30,6 +30,7 @@ MainForm::MainForm(QWidget *parent) : ...@@ -30,6 +30,7 @@ MainForm::MainForm(QWidget *parent) :
m_tableList.append(ui->mainTableFinsh); m_tableList.append(ui->mainTableFinsh);
m_tableList.append(ui->mainTableOther); m_tableList.append(ui->mainTableOther);
m_tableList.append(ui->mainTableNew); m_tableList.append(ui->mainTableNew);
m_tableList.append(ui->mainTableReservation);
// 注册信号槽参数 // 注册信号槽参数
qRegisterMetaType<CashierObject>("CashierObject"); qRegisterMetaType<CashierObject>("CashierObject");
qRegisterMetaType< QList<CashierObject> >("QList<CashierObject>"); qRegisterMetaType< QList<CashierObject> >("QList<CashierObject>");
...@@ -133,7 +134,7 @@ void MainForm::_Init() ...@@ -133,7 +134,7 @@ void MainForm::_Init()
// 初始化文字 // 初始化文字
ui->mainLabStoreid->setText(UI_STOREID); ui->mainLabStoreid->setText(UI_STOREID);
ui->mainLabVersion->setText("1.1.9"); ui->mainLabVersion->setText("1.2.2");
ui->mainLabCashier->setText(UI_CASHIER); ui->mainLabCashier->setText(UI_CASHIER);
// 初始化表 // 初始化表
...@@ -293,8 +294,12 @@ void MainForm::_SetTablesSortEnable(bool bEnable) ...@@ -293,8 +294,12 @@ void MainForm::_SetTablesSortEnable(bool bEnable)
} }
} }
QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus) QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus, int refundStatus)
{ {
if(refundStatus ==20 || refundStatus==22)
{
return ui->mainBtnRefund;
}
switch(orderStatus) switch(orderStatus)
{ {
case 1: case 1:
...@@ -378,12 +383,28 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus) ...@@ -378,12 +383,28 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
} }
} }
// 将数据插入到表中 // 将数据插入到表中
if(orderObject->status==2 && orderObject->delivery_status==2) if(orderObject->order_type == 2 && orderObject->status==2)
{
if(orderObject->refund_status == 20 ||orderObject->refund_status == 22)
{
tabBtn = ui->mainBtnRefund;
}else
{
tabBtn = ui->mainBtnReservation;
}
}else if(orderObject->status==2 && orderObject->delivery_status==2)
{ {
tabBtn = ui->mainBtnOur; if(orderObject->refund_status == 20 ||orderObject->refund_status == 22)
{
tabBtn = ui->mainBtnRefund;
}else
{
tabBtn = ui->mainBtnOur;
}
}else }else
{ {
tabBtn = _GetTabBtnByOrderStatus(orderObject->status); tabBtn = _GetTabBtnByOrderStatus(orderObject->status, orderObject->refund_status);
} }
orderObject->curt_table_btn = tabBtn; orderObject->curt_table_btn = tabBtn;
...@@ -410,7 +431,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus) ...@@ -410,7 +431,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
if(table == ui->mainTableRefund) if(table == ui->mainTableRefund)
{ {
QTableWidgetItem *item5 = new QTableWidgetItem(orderObject->status==20?"全额退款":"部分退款"); QTableWidgetItem *item5 = new QTableWidgetItem(orderObject->refund_status==20?"全额退款":"部分退款");
item5->setTextAlignment(Qt::AlignCenter); item5->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 5, item5); // 订单状态 table->setItem(0, 5, item5); // 订单状态
}else }else
...@@ -420,6 +441,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus) ...@@ -420,6 +441,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
table->setItem(0, 5, item5); // 下单时间 table->setItem(0, 5, item5); // 下单时间
} }
if(table == ui->mainTableReservation)
{
QTableWidgetItem *item6 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject->delivery_time).toString("MM-dd hh:mm"));
item6->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 6, item6); // 下单时间
}
if(table == ui->mainTableNew||table == ui->mainTableRefund||table==ui->mainTableOur) if(table == ui->mainTableNew||table == ui->mainTableRefund||table==ui->mainTableOur)
{ {
QWidget *pWdg = new QWidget(table); QWidget *pWdg = new QWidget(table);
...@@ -453,7 +480,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus) ...@@ -453,7 +480,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
emit startRemind(0); emit startRemind(0);
}else if(orderObject->order_type ==2 && orderObject->status ==2) }else if(orderObject->order_type ==2 && orderObject->status ==2)
{ {
emit startRemind(0); //TODO
//emit startRemind(0);
}else if(ui->mainTableRefund->rowCount() > 0) }else if(ui->mainTableRefund->rowCount() > 0)
{ {
emit startRemind(1); emit startRemind(1);
......
fmTakeaway/mainForm.h
#ifndef MAINFORM_H #ifndef MAINFORM_H
#define MAINFORM_H #define MAINFORM_H
#include <QDialog> #include <QDialog>
...@@ -96,7 +96,7 @@ private: ...@@ -96,7 +96,7 @@ private:
* 参数:[1]订单状态 * 参数:[1]订单状态
* 返回:对应的Tab按钮 * 返回:对应的Tab按钮
* */ * */
QPushButton *_GetTabBtnByOrderStatus(int orderStatus); QPushButton *_GetTabBtnByOrderStatus(int orderStatus, int refundStatus);
......
fmTakeaway/mainForm.ui
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0,0,0,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0,0">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<widget class="QFrame" name="mainFrmHead"> <widget class="QFrame" name="mainFrmHead">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>685</width> <width>780</width>
<height>75</height> <height>75</height>
</size> </size>
</property> </property>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<widget class="QPushButton" name="mainBtnOur"> <widget class="QPushButton" name="mainBtnOur">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>95</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<widget class="QPushButton" name="mainBtnMake"> <widget class="QPushButton" name="mainBtnMake">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>190</x> <x>285</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<widget class="QPushButton" name="mainBtnSend"> <widget class="QPushButton" name="mainBtnSend">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>285</x> <x>380</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<widget class="QPushButton" name="mainBtnFinsh"> <widget class="QPushButton" name="mainBtnFinsh">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>380</x> <x>475</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<widget class="QPushButton" name="mainBtnRefund"> <widget class="QPushButton" name="mainBtnRefund">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>475</x> <x>570</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<widget class="QPushButton" name="mainBtnOther"> <widget class="QPushButton" name="mainBtnOther">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>570</x> <x>665</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<widget class="QPushButton" name="mainBtnNew"> <widget class="QPushButton" name="mainBtnNew">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>95</x> <x>190</x>
<y>41</y> <y>41</y>
<width>105</width> <width>105</width>
<height>35</height> <height>35</height>
...@@ -269,6 +269,32 @@ ...@@ -269,6 +269,32 @@
<string>新订单</string> <string>新订单</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="mainBtnReservation">
<property name="geometry">
<rect>
<x>0</x>
<y>41</y>
<width>105</width>
<height>35</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>预约单</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="tableName" stdset="0">
<string>mainTableReservation</string>
</property>
<property name="name" stdset="0">
<string>预约单</string>
</property>
</widget>
<zorder>mainBtnReservation</zorder>
<zorder>mainBtnOur</zorder> <zorder>mainBtnOur</zorder>
<zorder>mainBtnNew</zorder> <zorder>mainBtnNew</zorder>
<zorder>mainBtnMake</zorder> <zorder>mainBtnMake</zorder>
...@@ -294,84 +320,117 @@ ...@@ -294,84 +320,117 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="mainBtnRJ"> <layout class="QVBoxLayout" name="verticalLayout_8">
<property name="minimumSize"> <property name="spacing">
<size> <number>0</number>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>日结</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnMDGL">
<property name="minimumSize">
<size>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>门店管理</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnDc">
<property name="minimumSize">
<size>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>菜品管理</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnHide">
<property name="minimumSize">
<size>
<width>60</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>隐藏</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnSet">
<property name="minimumSize">
<size>
<width>60</width>
<height>32</height>
</size>
</property> </property>
<property name="focusPolicy"> <property name="leftMargin">
<enum>Qt::NoFocus</enum> <number>0</number>
</property> </property>
<property name="text"> <property name="bottomMargin">
<string>设置</string> <number>0</number>
</property> </property>
</widget> <item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="leftMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="mainBtnRJ">
<property name="minimumSize">
<size>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>日结</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnDc">
<property name="minimumSize">
<size>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>菜品管理</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnMDGL">
<property name="minimumSize">
<size>
<width>70</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>门店管理</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnSet">
<property name="minimumSize">
<size>
<width>60</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mainBtnHide">
<property name="minimumSize">
<size>
<width>60</width>
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>隐藏</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -747,6 +806,87 @@ ...@@ -747,6 +806,87 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableReservation">
<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="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<property name="operationName" stdset="0">
<string>NULL</string>
</property>
<property name="operation" stdset="0">
<string>NULL</string>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>40</number>
</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>
<widget class="QTableWidget" name="mainTableFinsh"> <widget class="QTableWidget" name="mainTableFinsh">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
...@@ -1413,8 +1553,8 @@ ...@@ -1413,8 +1553,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>47</x> <x>102</x>
<y>50</y> <y>52</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>45</x> <x>45</x>
...@@ -1429,8 +1569,8 @@ ...@@ -1429,8 +1569,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>207</x> <x>292</x>
<y>57</y> <y>59</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>113</x> <x>113</x>
...@@ -1445,8 +1585,8 @@ ...@@ -1445,8 +1585,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>302</x> <x>387</x>
<y>65</y> <y>67</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>159</x> <x>159</x>
...@@ -1461,8 +1601,8 @@ ...@@ -1461,8 +1601,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>397</x> <x>482</x>
<y>57</y> <y>59</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>221</x> <x>221</x>
...@@ -1477,8 +1617,8 @@ ...@@ -1477,8 +1617,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>492</x> <x>577</x>
<y>62</y> <y>64</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>289</x> <x>289</x>
...@@ -1493,8 +1633,8 @@ ...@@ -1493,8 +1633,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>587</x> <x>672</x>
<y>64</y> <y>66</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>348</x> <x>348</x>
...@@ -1525,8 +1665,8 @@ ...@@ -1525,8 +1665,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>326</x> <x>284</x>
<y>263</y> <y>347</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>7</x>
...@@ -1541,8 +1681,8 @@ ...@@ -1541,8 +1681,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>429</x> <x>377</x>
<y>297</y> <y>381</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>7</x>
...@@ -1573,8 +1713,8 @@ ...@@ -1573,8 +1713,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>554</x> <x>657</x>
<y>316</y> <y>400</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>6</x> <x>6</x>
...@@ -1605,8 +1745,8 @@ ...@@ -1605,8 +1745,8 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>164</x> <x>197</x>
<y>60</y> <y>62</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>399</x> <x>399</x>
...@@ -1630,6 +1770,38 @@ ...@@ -1630,6 +1770,38 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>mainBtnReservation</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>55</x>
<y>61</y>
</hint>
<hint type="destinationlabel">
<x>1145</x>
<y>31</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainTableReservation</sender>
<signal>itemClicked(QTableWidgetItem*)</signal>
<receiver>MainForm</receiver>
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints>
<hint type="sourcelabel">
<x>443</x>
<y>137</y>
</hint>
<hint type="destinationlabel">
<x>1116</x>
<y>27</y>
</hint>
</hints>
</connection>
</connections> </connections>
<slots> <slots>
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
......
run/skin/deaufult.qss
...@@ -70,13 +70,13 @@ QWidget ...@@ -70,13 +70,13 @@ QWidget
{ {
border-image: url(:logo_1.png); border-image: url(:logo_1.png);
} }
#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther,#mainBtnOur #mainBtnReservation,#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther,#mainBtnOur
{ {
font: bold 11pt "微软雅黑"; font: bold 11pt "微软雅黑";
color: rgb(98, 98, 98); color: rgb(98, 98, 98);
border-image: url(:tabBtn_normal.png); border-image: url(:tabBtn_normal.png);
} }
#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOur:checked,#mainBtnOther:checked #mainBtnReservation:checked,#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOur:checked,#mainBtnOther:checked
{ {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
border-image: url(:tabBtn_checked.png); border-image: url(:tabBtn_checked.png);
...@@ -171,7 +171,7 @@ QWidget ...@@ -171,7 +171,7 @@ QWidget
{ {
color: rgb(172, 219, 169); color: rgb(172, 219, 169);
} }
#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther,#mainTableOur #mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther,#mainTableOur,#mainTableReservation
{ {
font: 11pt "微软雅黑"; font: 11pt "微软雅黑";
color: rgb(98, 98, 98); color: rgb(98, 98, 98);
...@@ -179,7 +179,8 @@ QWidget ...@@ -179,7 +179,8 @@ QWidget
} }
#mainTableNew QHeaderView::section,#mainTableMake QHeaderView::section, #mainTableNew QHeaderView::section,#mainTableMake QHeaderView::section,
#mainTableSend QHeaderView::section,#mainTableFinsh QHeaderView::section, #mainTableSend QHeaderView::section,#mainTableFinsh QHeaderView::section,
#mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section,#mainTableOur QHeaderView::section #mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section,
#mainTableOur QHeaderView::section,#mainTableReservation QHeaderView::section
{ {
border: 0px; border: 0px;
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
...@@ -188,26 +189,30 @@ QWidget ...@@ -188,26 +189,30 @@ QWidget
} }
#mainTableNew QHeaderView::down-arrow,#mainTableMake QHeaderView::down-arrow, #mainTableNew QHeaderView::down-arrow,#mainTableMake QHeaderView::down-arrow,
#mainTableSend QHeaderView::down-arrow,#mainTableFinsh QHeaderView::down-arrow, #mainTableSend QHeaderView::down-arrow,#mainTableFinsh QHeaderView::down-arrow,
#mainTableRefund QHeaderView::down-arrow,#mainTableOther QHeaderView::down-arrow,#mainTableOur QHeaderView::down-arrow #mainTableRefund QHeaderView::down-arrow,#mainTableOther QHeaderView::down-arrow,
#mainTableOur QHeaderView::down-arrow,#mainTableReservation QHeaderView::down-arrow
{ {
border: 0px; border: 0px;
} }
#mainTableNew QHeaderView::up-arrow,#mainTableMake QHeaderView::up-arrow, #mainTableNew QHeaderView::up-arrow,#mainTableMake QHeaderView::up-arrow,
#mainTableSend QHeaderView::up-arrow,#mainTableFinsh QHeaderView::up-arrow, #mainTableSend QHeaderView::up-arrow,#mainTableFinsh QHeaderView::up-arrow,
#mainTableRefund QHeaderView::up-arrow,#mainTableOther QHeaderView::up-arrow,#mainTableOur QHeaderView::up-arrow #mainTableRefund QHeaderView::up-arrow,#mainTableOther QHeaderView::up-arrow,
#mainTableOur QHeaderView::up-arrow,#mainTableReservation QHeaderView::up-arrow
{ {
border: 0px; border: 0px;
} }
#mainTableNew QScrollBar:vertical,#mainTableMake QScrollBar:vertical, #mainTableNew QScrollBar:vertical,#mainTableMake QScrollBar:vertical,
#mainTableSend QScrollBar:vertical,#mainTableFinsh QScrollBar:vertical, #mainTableSend QScrollBar:vertical,#mainTableFinsh QScrollBar:vertical,
#mainTableRefund QScrollBar:vertical,#mainTableOther QScrollBar:vertical,#mainTableOur QScrollBar:vertical #mainTableRefund QScrollBar:vertical,#mainTableOther QScrollBar:vertical,
#mainTableOur QScrollBar:vertical,#mainTableReservation QScrollBar:vertical
{ {
background: transparent; background: transparent;
width: 8px; width: 8px;
} }
#mainTableNew QScrollBar::handle:vertical,#mainTableMake QScrollBar::handle:vertical, #mainTableNew QScrollBar::handle:vertical,#mainTableMake QScrollBar::handle:vertical,
#mainTableSend QScrollBar::handle:vertical,#mainTableFinsh QScrollBar::handle:vertical, #mainTableSend QScrollBar::handle:vertical,#mainTableFinsh QScrollBar::handle:vertical,
#mainTableRefund QScrollBar::handle:vertical,#mainTableOther QScrollBar::handle:vertical,#mainTableOur QScrollBar::handle:vertical #mainTableRefund QScrollBar::handle:vertical,#mainTableOther QScrollBar::handle:vertical,
#mainTableOur QScrollBar::handle:vertical,#mainTableReservation QScrollBar::handle:vertical
{ {
border-radius: 6px; border-radius: 6px;
background: rgb(64, 119, 61); background: rgb(64, 119, 61);
...@@ -215,13 +220,15 @@ QWidget ...@@ -215,13 +220,15 @@ QWidget
} }
#mainTableNew QScrollBar::add-line:vertical,#mainTableMake QScrollBar::add-line:vertical, #mainTableNew QScrollBar::add-line:vertical,#mainTableMake QScrollBar::add-line:vertical,
#mainTableSend QScrollBar::add-line:vertical,#mainTableFinsh QScrollBar::add-line:vertical, #mainTableSend QScrollBar::add-line:vertical,#mainTableFinsh QScrollBar::add-line:vertical,
#mainTableRefund QScrollBar::add-line:vertical,#mainTableOther QScrollBar::add-line:vertical,#mainTableOur QScrollBar::add-line:vertical #mainTableRefund QScrollBar::add-line:vertical,#mainTableOther QScrollBar::add-line:vertical,
#mainTableOur QScrollBar::add-line:vertical,#mainTableReservation QScrollBar::add-line:vertical
{ {
height: 0px; height: 0px;
} }
#mainTableNew QScrollBar::sub-line:vertical,#mainTableMake QScrollBar::sub-line:vertical, #mainTableNew QScrollBar::sub-line:vertical,#mainTableMake QScrollBar::sub-line:vertical,
#mainTableSend QScrollBar::sub-line:vertical,#mainTableFinsh QScrollBar::sub-line:vertical, #mainTableSend QScrollBar::sub-line:vertical,#mainTableFinsh QScrollBar::sub-line:vertical,
#mainTableRefund QScrollBar::sub-line:vertical,#mainTableOther QScrollBar::sub-line:vertical,#mainTableOur QScrollBar::sub-line:vertical #mainTableRefund QScrollBar::sub-line:vertical,#mainTableOther QScrollBar::sub-line:vertical,
#mainTableOur QScrollBar::sub-line:vertical,#mainTableReservation QScrollBar::sub-line:vertical
{ {
height: 0px; height: 0px;
} }
......
run/skin/deaufult.rcc
No preview for this file type
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