Skip to content

F
FmTakeaway
Commit 883f497f by ss.dai
Options

新增堂食单 自提单

parent db48d2cf
Showing with 723 additions and 293 deletions
fmTakeaway/Control/flowControl.cpp
...@@ -147,6 +147,7 @@ bool FlowControl::_PullOrder() ...@@ -147,6 +147,7 @@ bool FlowControl::_PullOrder()
//新数据 //新数据
orderObject = new OrderObject(this); orderObject = new OrderObject(this);
orderObject->FromJson(jsonObject); orderObject->FromJson(jsonObject);
m_ordersMap.insert(orderObject->order_id, orderObject); m_ordersMap.insert(orderObject->order_id, orderObject);
QLOG_INFO() << QString("new order[%1:%2].[data:%3]") QLOG_INFO() << QString("new order[%1:%2].[data:%3]")
.arg(orderObject->order_id, orderObject->status_desc) .arg(orderObject->order_id, orderObject->status_desc)
...@@ -198,7 +199,7 @@ bool FlowControl::_PullOrder() ...@@ -198,7 +199,7 @@ bool FlowControl::_PullOrder()
} }
} }
if(oldStatus != orderObject->status) if(oldStatus != orderObject->status && orderObject->order_type!=4 && orderObject->order_type!=3)
{ {
emit changeOrderStatus(orderObject, oldStatus, bRed); emit changeOrderStatus(orderObject, oldStatus, bRed);
} }
...@@ -505,6 +506,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,QString reason) ...@@ -505,6 +506,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,QString reason)
QJsonObject sendJson; QJsonObject sendJson;
QJsonObject recvJson; QJsonObject recvJson;
sendJson = DataManger::GetInstance().GetRefundOrderData(reason,orderId); sendJson = DataManger::GetInstance().GetRefundOrderData(reason,orderId);
emit showAlert(AlertForm::LOADING, "正在通信......"); emit showAlert(AlertForm::LOADING, "正在通信......");
......
fmTakeaway/Model/orderObject.cpp
...@@ -19,6 +19,36 @@ void OrderObject::FromJson(const QJsonObject &json) ...@@ -19,6 +19,36 @@ void OrderObject::FromJson(const QJsonObject &json)
return; return;
} }
int OrderObject::getorder_type() const
{
return order_type;
}
void OrderObject::setorder_type(const int &v)
{
order_type = v;
}
QString OrderObject::getdelivery_code() const
{
return delivery_code;
}
void OrderObject::setdelivery_code(const QString &v)
{
delivery_code = v;
}
QString OrderObject::getmeal_num() const
{
return meal_num;
}
void OrderObject::setmeal_num(const QString &v)
{
meal_num = v;
}
int OrderObject::getservice_fee() const int OrderObject::getservice_fee() const
{ {
return service_fee; return service_fee;
......
fmTakeaway/Model/orderObject.h
...@@ -56,6 +56,9 @@ public: ...@@ -56,6 +56,9 @@ public:
Q_PROPERTY (int dis_platform_fee READ getdis_platform_fee WRITE setdis_platform_fee) Q_PROPERTY (int dis_platform_fee READ getdis_platform_fee WRITE setdis_platform_fee)
Q_PROPERTY (int dis_shop_fee READ getdis_shop_fee WRITE setdis_shop_fee) Q_PROPERTY (int dis_shop_fee READ getdis_shop_fee WRITE setdis_shop_fee)
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 order_type READ getorder_type WRITE setorder_type)
Q_PROPERTY (QString delivery_code READ getdelivery_code WRITE setdelivery_code)
Q_PROPERTY (QString meal_num READ getmeal_num WRITE setmeal_num)
int service_fee; //平台佣金 int service_fee; //平台佣金
...@@ -82,6 +85,7 @@ public: ...@@ -82,6 +85,7 @@ public:
QString invoice_title; //发票抬头 QString invoice_title; //发票抬头
QString order_id; //订单号 QString order_id; //订单号
int order_index; //渠道当天序号 int order_index; //渠道当天序号
int order_type; //订单类型
QString pay_type; //支付方式 QString pay_type; //支付方式
QString phone; //电话 QString phone; //电话
QString posorder_id; //pos订单号 QString posorder_id; //pos订单号
...@@ -100,9 +104,19 @@ public: ...@@ -100,9 +104,19 @@ public:
int user_fee; //应付金额 int user_fee; //应付金额
QStringList records; //订单操作记录 QStringList records; //订单操作记录
QString delivery_code; // 提货码
QString meal_num; // 堂食桌号
protected: protected:
int getorder_type() const;
void setorder_type(const int& v);
QString getdelivery_code() const;
void setdelivery_code(const QString& v);
QString getmeal_num() const;
void setmeal_num(const QString& v);
int getservice_fee() const ; int getservice_fee() const ;
void setservice_fee(const int& v); void setservice_fee(const int& v);
int getdis_platform_fee() const ; int getdis_platform_fee() const ;
......
fmTakeaway/Model/productObject.cpp
...@@ -9,6 +9,16 @@ void ProductObject::setPid(const QString &v) ...@@ -9,6 +9,16 @@ void ProductObject::setPid(const QString &v)
pid = v; pid = v;
} }
QString ProductObject::getbsk_num() const
{
return bsk_num;
}
void ProductObject::setbsk_num(const QString &v)
{
bsk_num = v;
}
QString ProductObject::getName() const QString ProductObject::getName() const
{ {
return name; return name;
......
fmTakeaway/Model/productObject.h
...@@ -15,17 +15,23 @@ public: ...@@ -15,17 +15,23 @@ public:
Q_PROPERTY (QString upc READ getupc WRITE setupc) Q_PROPERTY (QString upc READ getupc WRITE setupc)
Q_PROPERTY (int price READ getprice WRITE setprice) Q_PROPERTY (int price READ getprice WRITE setprice)
Q_PROPERTY (int productAmount READ getProductAmount WRITE setProductAmount) Q_PROPERTY (int productAmount READ getProductAmount WRITE setProductAmount)
Q_PROPERTY(QString bsk_num READ getbsk_num WRITE setbsk_num)
QString pid; QString pid;
QString name; QString name;
QString upc; QString upc;
int price; int price;
int productAmount; int productAmount;
QString bsk_num;
protected: protected:
QString getPid() const ; QString getPid() const ;
void setPid(const QString& v); void setPid(const QString& v);
QString getbsk_num() const;
void setbsk_num(const QString& v);
QString getName() const ; QString getName() const ;
void setName(const QString& v); void setName(const QString& v);
......
fmTakeaway/detailForm.cpp
...@@ -29,8 +29,7 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -29,8 +29,7 @@ void DetailForm::InitData(OrderObject *orderObject)
{ {
m_orderObject = orderObject; m_orderObject = orderObject;
// 恢复界面 // 恢复界面
ui->detailTable0->clearContents(); ui->detailTable0->clear();
ui->detailTable0->setRowCount(0);
ui->detailBtn2->show(); ui->detailBtn2->show();
ui->detailBtn3->show(); ui->detailBtn3->show();
...@@ -46,21 +45,45 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -46,21 +45,45 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailLab4->setText(QString("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party, ui->detailLab4->setText(QString("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
Penny2Dollar(orderObject->send_fee))); Penny2Dollar(orderObject->send_fee)));
ui->detailLab5->setText(orderObject->delivery_time==0? "立即送出" : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm")); ui->detailLab5->setText(orderObject->delivery_time==0? "立即送出" : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? "暂未指定" : QString("[姓名]%1 [电话]%2") ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? "暂未指定" : QString("[姓名]%1 [电话]%2")
.arg(orderObject->courier_name, orderObject->courier_phone)); .arg(orderObject->courier_name, orderObject->courier_phone));
ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee)); ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));
ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票"); ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票");
if(orderObject->order_type==3 || orderObject->order_type==4)
{
ui->detailSlab8->setText("提货码");
ui->detailLab8->setText(orderObject->delivery_code);
}
QString topName = "";
QTreeWidgetItem* topItem = NULL;
for(int i=0; i<orderObject->proList.count(); i++) for(int i=0; i<orderObject->proList.count(); i++)
{ {
ui->detailTable0->insertRow(i); if(orderObject->proList.at(i)->bsk_num.isEmpty())
ui->detailTable0->setItem(i, 0, new QTableWidgetItem(orderObject->proList.at(i)->name)); // 商品名 {
ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter); orderObject->proList.at(i)->bsk_num = "1";
ui->detailTable0->setItem(i, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price))); // 价格 }
ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter); if(topName.compare(orderObject->proList.at(i)->bsk_num))
ui->detailTable0->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->productAmount))); // 数量 {
ui->detailTable0->item(i, 2)->setTextAlignment(Qt::AlignCenter); if(topItem!=NULL)
{
topItem->setExpanded(true);
}
topName = orderObject->proList.at(i)->bsk_num;
topItem = new QTreeWidgetItem(QStringList()<<QString("%1号口袋").arg(topName));
ui->detailTable0->addTopLevelItem(topItem);
}
QTreeWidgetItem *cItem = new QTreeWidgetItem(QStringList()<< orderObject->proList.at(i)->name
<< Penny2Dollar(orderObject->proList.at(i)->price)
<< QString::number(orderObject->proList.at(i)->productAmount));
cItem->setTextAlignment(0, Qt::AlignCenter);
cItem->setTextAlignment(1, Qt::AlignCenter);
cItem->setTextAlignment(2, Qt::AlignCenter);
topItem->addChild(cItem);
} }
topItem->setExpanded(true);
QString records; QString records;
foreach(QString record, orderObject->records) foreach(QString record, orderObject->records)
...@@ -91,6 +114,12 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -91,6 +114,12 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailBtn3->hide(); ui->detailBtn3->hide();
} }
m_rejectForm = new RejectForm(this); m_rejectForm = new RejectForm(this);
if(orderObject->order_type==3 || orderObject->order_type==4)
{
ui->detailBtn2->hide();
ui->detailBtn3->hide();
}
} }
void DetailForm::_Init() void DetailForm::_Init()
...@@ -102,8 +131,12 @@ void DetailForm::_Init() ...@@ -102,8 +131,12 @@ void DetailForm::_Init()
ui->detailTable0->setColumnWidth(0, tableWidth*5/9); ui->detailTable0->setColumnWidth(0, tableWidth*5/9);
ui->detailTable0->setColumnWidth(1, tableWidth*2/9); ui->detailTable0->setColumnWidth(1, tableWidth*2/9);
ui->detailTable0->setColumnWidth(2, tableWidth*2/9); ui->detailTable0->setColumnWidth(2, tableWidth*2/9);
ui->detailTable0->horizontalHeader()->setFixedHeight(25); ui->detailTable0->header()->setDefaultAlignment(Qt::AlignCenter);
ui->detailTable0->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed); ui->detailTable0->header()->setFixedHeight(25);
ui->detailTable0->header()->setStretchLastSection(true);
ui->detailTable0->header()->setSectionResizeMode(QHeaderView::Fixed);
// ui->detailTable0->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
} }
void DetailForm::onOperaBtnClicked() void DetailForm::onOperaBtnClicked()
......
fmTakeaway/detailForm.ui
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="detailTable0"> <widget class="QTreeWidget" name="detailTable0">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
...@@ -167,20 +167,14 @@ ...@@ -167,20 +167,14 @@
<property name="selectionBehavior"> <property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum> <enum>QAbstractItemView::SelectRows</enum>
</property> </property>
<property name="showGrid"> <property name="indentation">
<bool>false</bool> <number>20</number>
</property> </property>
<attribute name="horizontalHeaderCascadingSectionResizes"> <attribute name="headerVisible">
<bool>true</bool> <bool>true</bool>
</attribute> </attribute>
<attribute name="horizontalHeaderStretchLastSection"> <attribute name="headerMinimumSectionSize">
<bool>true</bool> <number>40</number>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>35</number>
</attribute> </attribute>
<column> <column>
<property name="text"> <property name="text">
...@@ -189,7 +183,7 @@ ...@@ -189,7 +183,7 @@
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>价格</string> <string>单价</string>
</property> </property>
</column> </column>
<column> <column>
...@@ -271,7 +265,7 @@ ...@@ -271,7 +265,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,1,1,1,1,1,1,1,1,1,0">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
...@@ -820,6 +814,19 @@ ...@@ -820,6 +814,19 @@
</layout> </layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13"> <layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
......
fmTakeaway/mainForm.cpp
...@@ -22,6 +22,8 @@ MainForm::MainForm(QWidget *parent) : ...@@ -22,6 +22,8 @@ MainForm::MainForm(QWidget *parent) :
// 初始化成员变量 // 初始化成员变量
m_prevBtn = NULL; m_prevBtn = NULL;
m_prevTable = NULL; m_prevTable = NULL;
m_tableList.append(ui->mainTableTSD);
m_tableList.append(ui->mainTableZTD);
m_tableList.append(ui->mainTableNew); m_tableList.append(ui->mainTableNew);
m_tableList.append(ui->mainTableMake); m_tableList.append(ui->mainTableMake);
m_tableList.append(ui->mainTableSend); m_tableList.append(ui->mainTableSend);
...@@ -102,7 +104,7 @@ void MainForm::MyShow() ...@@ -102,7 +104,7 @@ void MainForm::MyShow()
void MainForm::_Init() void MainForm::_Init()
{ {
this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
this->showFullScreen(); //this->showFullScreen();
// 显示托盘 // 显示托盘
m_tray.show(); m_tray.show();
...@@ -298,24 +300,38 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool ...@@ -298,24 +300,38 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
_SetTablesSortEnable(false); _SetTablesSortEnable(false);
QTableWidget *table; QTableWidget *table;
QPushButton *tabBtn; QPushButton *tabBtn;
// 非首次收到的订单需要现在原先表中删除 if(orderObject->order_type!=3 && orderObject->order_type!=4)
if(oldStatus != -100)
{ {
tabBtn = _GetTabBtnByOrderStatus(oldStatus); // 非首次收到的订单需要现在原先表中删除
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString()); if(oldStatus != -100)
for(int i=0; i<table->rowCount(); i++)
{ {
if(!table->item(i, 1)->text().compare(orderObject->order_id)) tabBtn = _GetTabBtnByOrderStatus(oldStatus);
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
for(int i=0; i<table->rowCount(); i++)
{ {
table->removeRow(i); if(!table->item(i, 1)->text().compare(orderObject->order_id))
QString btnText(tabBtn->property("name").toString()); {
btnText = QString("%1\n%2").arg(table->rowCount()).arg(btnText); table->removeRow(i);
tabBtn->setText(btnText); QString btnText(tabBtn->property("name").toString());
btnText = QString("%1\n%2").arg(table->rowCount()).arg(btnText);
tabBtn->setText(btnText);
}
} }
} }
} }
// 将数据插入到表中 // 将数据插入到表中
tabBtn = _GetTabBtnByOrderStatus(orderObject->status); if(orderObject->order_type==3)
{
tabBtn = ui->mainBtnZTD;
}else if(orderObject->order_type==4)
{
tabBtn = ui->mainBtnTSD;
}else
{
tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
}
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString()); table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
table->insertRow(0); table->insertRow(0);
QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1#%2").arg(orderObject->channelName).arg(orderObject->order_index)); QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1#%2").arg(orderObject->channelName).arg(orderObject->order_index));
...@@ -345,7 +361,13 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool ...@@ -345,7 +361,13 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
item4->setTextColor(QColor("red")); item4->setTextColor(QColor("red"));
item5->setTextColor(QColor("red")); item5->setTextColor(QColor("red"));
} }
if(table != ui->mainTableFinsh && table != ui->mainTableOther)
if(orderObject->order_type==3 || orderObject->order_type==4)
{
QTableWidgetItem *item6 = new QTableWidgetItem(orderObject->delivery_code);
item6->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 6, item6); // 提货券
}else if(table != ui->mainTableFinsh && table != ui->mainTableOther)
{ {
QWidget *pWdg = new QWidget(table); QWidget *pWdg = new QWidget(table);
QHBoxLayout *hLayout = new QHBoxLayout(pWdg); QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
......
fmTakeaway/mainForm.ui
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>836</width> <width>1024</width>
<height>600</height> <height>768</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_12" stretch="1,0,0,0,1,1"> <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,0,0,0,1,1">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
...@@ -106,6 +106,110 @@ ...@@ -106,6 +106,110 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mainBtnTSD">
<property name="minimumSize">
<size>
<width>97</width>
<height>53</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>97</width>
<height>53</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
堂食单</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="tableName" stdset="0">
<string>mainTableTSD</string>
</property>
<property name="name" stdset="0">
<string>堂食单</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mainBtnZTD">
<property name="minimumSize">
<size>
<width>97</width>
<height>53</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>97</width>
<height>53</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
自提单</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="tableName" stdset="0">
<string>mainTableZTD</string>
</property>
<property name="name" stdset="0">
<string>自提单</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
...@@ -124,43 +228,36 @@ ...@@ -124,43 +228,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_11"> <widget class="QPushButton" name="mainBtnNew">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnNew"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
新订单</string> 新订单</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableNew</string> <string>mainTableNew</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>新订单</string> <string>新订单</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -183,43 +280,36 @@ ...@@ -183,43 +280,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_13"> <widget class="QPushButton" name="mainBtnMake">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnMake"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
制作中</string> 制作中</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableMake</string> <string>mainTableMake</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>制作中</string> <string>制作中</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -242,43 +332,36 @@ ...@@ -242,43 +332,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_14"> <widget class="QPushButton" name="mainBtnSend">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnSend"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
配送中</string> 配送中</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableSend</string> <string>mainTableSend</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>配送中</string> <string>配送中</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -301,43 +384,36 @@ ...@@ -301,43 +384,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_15"> <widget class="QPushButton" name="mainBtnFinsh">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnFinsh"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
已完成</string> 已完成</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableFinsh</string> <string>mainTableFinsh</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>已完成</string> <string>已完成</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -360,43 +436,36 @@ ...@@ -360,43 +436,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_16"> <widget class="QPushButton" name="mainBtnRefund">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnRefund"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
需退单</string> 需退单</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableRefund</string> <string>mainTableRefund</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>需退单</string> <string>需退单</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -419,43 +488,36 @@ ...@@ -419,43 +488,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_17"> <widget class="QPushButton" name="mainBtnOther">
<property name="spacing"> <property name="minimumSize">
<number>0</number> <size>
</property> <width>97</width>
<item> <height>53</height>
<widget class="QPushButton" name="mainBtnOther"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>97</width> <size>
<height>53</height> <width>97</width>
</size> <height>53</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="focusPolicy">
<width>97</width> <enum>Qt::NoFocus</enum>
<height>53</height> </property>
</size> <property name="text">
</property> <string>0
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>0
其他</string> 其他</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tableName" stdset="0"> <property name="tableName" stdset="0">
<string>mainTableOther</string> <string>mainTableOther</string>
</property> </property>
<property name="name" stdset="0"> <property name="name" stdset="0">
<string>其他</string> <string>其他</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
...@@ -557,6 +619,87 @@ ...@@ -557,6 +619,87 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QTableWidget" name="mainTableZTD">
<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="mainTableNew"> <widget class="QTableWidget" name="mainTableNew">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
...@@ -638,6 +781,87 @@ ...@@ -638,6 +781,87 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="mainTableTSD">
<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="mainTableMake"> <widget class="QTableWidget" name="mainTableMake">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
...@@ -1452,12 +1676,12 @@ ...@@ -1452,12 +1676,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>142</x> <x>389</x>
<y>68</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>45</x> <x>45</x>
<y>-49</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1468,12 +1692,12 @@ ...@@ -1468,12 +1692,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>292</x> <x>488</x>
<y>70</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>113</x> <x>113</x>
<y>-24</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1484,12 +1708,12 @@ ...@@ -1484,12 +1708,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>393</x> <x>587</x>
<y>70</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>159</x> <x>159</x>
<y>-39</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1500,12 +1724,12 @@ ...@@ -1500,12 +1724,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>494</x> <x>686</x>
<y>70</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>221</x> <x>221</x>
<y>-34</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1516,12 +1740,12 @@ ...@@ -1516,12 +1740,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>595</x> <x>785</x>
<y>70</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>289</x> <x>289</x>
<y>-63</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1532,12 +1756,12 @@ ...@@ -1532,12 +1756,12 @@
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>696</x> <x>884</x>
<y>70</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>348</x> <x>348</x>
<y>-50</y> <y>0</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
...@@ -1548,8 +1772,8 @@ ...@@ -1548,8 +1772,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>71</x> <x>198</x>
<y>116</y> <y>192</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>8</x> <x>8</x>
...@@ -1564,8 +1788,8 @@ ...@@ -1564,8 +1788,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>190</x> <x>494</x>
<y>180</y> <y>256</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>7</x>
...@@ -1580,8 +1804,8 @@ ...@@ -1580,8 +1804,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>310</x> <x>617</x>
<y>214</y> <y>290</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>7</x>
...@@ -1596,8 +1820,8 @@ ...@@ -1596,8 +1820,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>432</x> <x>739</x>
<y>271</y> <y>347</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>5</x> <x>5</x>
...@@ -1612,8 +1836,8 @@ ...@@ -1612,8 +1836,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>554</x> <x>862</x>
<y>316</y> <y>392</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>6</x> <x>6</x>
...@@ -1628,8 +1852,8 @@ ...@@ -1628,8 +1852,8 @@
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot> <slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>677</x> <x>985</x>
<y>364</y> <y>440</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>8</x> <x>8</x>
...@@ -1637,6 +1861,70 @@ ...@@ -1637,6 +1861,70 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>mainBtnTSD</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>143</x>
<y>45</y>
</hint>
<hint type="destinationlabel">
<x>511</x>
<y>383</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainBtnZTD</sender>
<signal>clicked()</signal>
<receiver>MainForm</receiver>
<slot>onMainTabBtnClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>242</x>
<y>45</y>
</hint>
<hint type="destinationlabel">
<x>511</x>
<y>383</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainTableZTD</sender>
<signal>itemClicked(QTableWidgetItem*)</signal>
<receiver>MainForm</receiver>
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints>
<hint type="sourcelabel">
<x>65</x>
<y>350</y>
</hint>
<hint type="destinationlabel">
<x>511</x>
<y>383</y>
</hint>
</hints>
</connection>
<connection>
<sender>mainTableTSD</sender>
<signal>itemClicked(QTableWidgetItem*)</signal>
<receiver>MainForm</receiver>
<slot>onMainTableItemClicked(QTableWidgetItem*)</slot>
<hints>
<hint type="sourcelabel">
<x>310</x>
<y>350</y>
</hint>
<hint type="destinationlabel">
<x>511</x>
<y>383</y>
</hint>
</hints>
</connection>
</connections> </connections>
<slots> <slots>
<slot>onMainTabBtnClicked()</slot> <slot>onMainTabBtnClicked()</slot>
......
fmTestClient/fmTestClient.pro
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
QT += core gui network QT += core gui network
CONFIG += c++11
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = fmTestClient TARGET = fmTestClient
......
fmTestClient/mainForm.cpp
...@@ -8,6 +8,11 @@ MainForm::MainForm(QWidget *parent) : ...@@ -8,6 +8,11 @@ MainForm::MainForm(QWidget *parent) :
ui(new Ui::MainForm) ui(new Ui::MainForm)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->host->setText("127.0.0.1");
ui->port->setText("34953");
ui->sendData->setText(R"({"fm_cmd": "put_store_info","fm_ver": "1.0","store_info":{"operator_id": "00000002","pos_id": "1","store_id": "208888","business_date": "20150701"}})");
} }
MainForm::~MainForm() MainForm::~MainForm()
......
fmTestClient/mainForm.ui
...@@ -64,6 +64,9 @@ ...@@ -64,6 +64,9 @@
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text">
<string/>
</property>
</widget> </widget>
<widget class="QLineEdit" name="port"> <widget class="QLineEdit" name="port">
<property name="geometry"> <property name="geometry">
......
run/skin/deaufult.qss
...@@ -20,12 +20,12 @@ QWidget ...@@ -20,12 +20,12 @@ QWidget
{ {
border-image: url(:logo_1.png); border-image: url(:logo_1.png);
} }
#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther #mainBtnZTD,#mainBtnTSD,#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther
{ {
color: #e4d0cd; color: #e4d0cd;
border-image: url(:tabBtn_normal.png); border-image: url(:tabBtn_normal.png);
} }
#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOther:checked #mainBtnZTD:checked,#mainBtnTSD:checked,#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOther:checked
{ {
color: #262626; color: #262626;
border-image: url(:tabBtn_checked.png); border-image: url(:tabBtn_checked.png);
...@@ -103,12 +103,13 @@ QWidget ...@@ -103,12 +103,13 @@ QWidget
{ {
color: rgb(172, 219, 169); color: rgb(172, 219, 169);
} }
#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther #mainTableTSD,#mainTableZTD,#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther
{ {
font: 11pt "微软雅黑"; font: 11pt "微软雅黑";
color: rgb(98, 98, 98); color: rgb(98, 98, 98);
selection-background-color: #f4f4f4; selection-background-color: #f4f4f4;
} }
#mainTableTSD QHeaderView::section,#mainTableZTD QHeaderView::section,
#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 #mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section
...@@ -465,6 +466,12 @@ QWidget ...@@ -465,6 +466,12 @@ QWidget
{ {
height: 0px; height: 0px;
} }
#detailTable0::item {
min-height: 35; max-height: 35;
border-bottom: 1px solid #d9d9d9;
border-right: 1 solid #d9d9d9;
}
/*---------------------------------DetailForm[ end ]---------------------------------*/ /*---------------------------------DetailForm[ end ]---------------------------------*/
/*---------------------------------RejectForm[start]-------------------------------------*/ /*---------------------------------RejectForm[start]-------------------------------------*/
#RejectForm #RejectForm
......
run/skin/deaufult.rcc
No preview for this file type
run/skin/make.bat
rcc -binary deaufult.qrc -o ../../../build/takeaway-Debug/fmTakeaway/debug/skin/deaufult.rcc rcc -binary deaufult.qrc -o deaufult.rcc
\ No newline at end of file \ No newline at end of file
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