Skip to content

F
fmtakeout
Commit 4b614eae by xiaoqing.gu
Options

修改新订单界面商品显示问题、按钮样式表、关闭按钮

parent d947008d
Showing with 72 additions and 30 deletions
takeout/view/newdetailform.cpp
#include "newdetailform.h" #include "newdetailform.h"
#include "ui_newdetailform.h" #include "ui_newdetailform.h"
#include <QDateTime> #include <QDateTime>
#include <QPushButton>
#include "preDefine.h" #include "preDefine.h"
#include "base/Arithmetic/util.h" #include "base/Arithmetic/util.h"
#include "base/Config/configManger.h" #include "base/Config/configManger.h"
...@@ -97,11 +98,11 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag) ...@@ -97,11 +98,11 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
ui->detailLab8_3->setText(QString::fromLocal8Bit("%1").arg(QString::number(orderObject->package_fee / 100.0, 'f', 2).append(QString::fromLocal8Bit("(元)")))); ui->detailLab8_3->setText(QString::fromLocal8Bit("%1").arg(QString::number(orderObject->package_fee / 100.0, 'f', 2).append(QString::fromLocal8Bit("(元)"))));
*/ */
for(int i=0; i<orderObject->proList.count(); i++) // for(int i=0; i<orderObject->proList.count(); i++)
{ // {
ProductObject *product = orderObject->proList.at(i); // ProductObject *product = orderObject->proList.at(i);
ui->dishTableWidget->insertRow(0); // ui->dishTableWidget->insertRow(0);
QString name = product->name , property_tags=product->property_tags; // QString name = product->name , property_tags=product->property_tags;
/* /*
if(!property_tags.isEmpty()) if(!property_tags.isEmpty())
...@@ -122,19 +123,19 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag) ...@@ -122,19 +123,19 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
*/ */
//商品如果有规格的话，商品的规格显示在单元格的第二行，并且字体颜色都有限制 //商品如果有规格的话，商品的规格显示在单元格的第二行，并且字体颜色都有限制
if(!property_tags.isEmpty()) { // if(!property_tags.isEmpty()) {
QString propStr = property_tags.replace(",", "+"); // QString propStr = property_tags.replace(",", "+");
name.append(QString::fromLocal8Bit("\r\n").append(QString("<font size =6 color=rgb(150,150,150)>%1</font>").arg(propStr))); // name.append(QString::fromLocal8Bit("\r\n").append(QString("<font size =6 color=rgb(150,150,150)>%1</font>").arg(propStr)));
} // }
ui->dishTableWidget->setItem(i, 0, new QTableWidgetItem(name)); // 商品名 // ui->dishTableWidget->setItem(i, 0, new QTableWidgetItem(name)); // 商品名
ui->dishTableWidget->item(i, 0)->setTextAlignment(Qt::AlignLeft); // ui->dishTableWidget->item(i, 0)->setTextAlignment(Qt::AlignLeft);
ui->dishTableWidget->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->price/100.0))); // 价格 // ui->dishTableWidget->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->price/100.0))); // 价格
ui->dishTableWidget->item(i, 2)->setTextAlignment(Qt::AlignCenter); // ui->dishTableWidget->item(i, 2)->setTextAlignment(Qt::AlignCenter);
ui->dishTableWidget->setItem(i, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量 // ui->dishTableWidget->setItem(i, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量
ui->dishTableWidget->item(i, 1)->setTextAlignment(Qt::AlignCenter); // ui->dishTableWidget->item(i, 1)->setTextAlignment(Qt::AlignCenter);
} // }
//商品汇总信息显示在tablewidget中 //商品汇总信息显示在tablewidget中
// ui->sumTableWidget->setItem(0, 0, new QTableWidgetItem(QString::number(orderObject->total_amount))); // ui->sumTableWidget->setItem(0, 0, new QTableWidgetItem(QString::number(orderObject->total_amount)));
...@@ -151,6 +152,41 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag) ...@@ -151,6 +152,41 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
// ui->sumTableWidget->setItem(3, 1, new QTableWidgetItem(QString::number(dis_amount))); // ui->sumTableWidget->setItem(3, 1, new QTableWidgetItem(QString::number(dis_amount)));
// ui->sumTableWidget->item(3, 1)->setTextAlignment(Qt::AlignCenter); // ui->sumTableWidget->item(3, 1)->setTextAlignment(Qt::AlignCenter);
for(int i=0; i<orderObject->proList.count(); i++)
{
ProductObject *product = orderObject->proList.at(i);
ui->dishTableWidget->insertRow(0);
QString name = product->name , property_tags=product->property_tags;
if(!property_tags.isEmpty())
{
//<font color='#ff0000'>未登录</font>
QTableWidgetItem *item = new QTableWidgetItem(property_tags);
item->setTextColor(QColor(150,150,150));
item->setFont(QFont("微软雅黑",9));
//name.append(QString::fromLocal8Bit("\r\n加料：")).append(QString(property_tags.replace(",", "\r\n")));
ui->dishTableWidget->setItem(0, 0, item); // 商品名
//setTextColor(QColor(255,0,0)
ui->dishTableWidget->item(0, 0)->setTextAlignment(Qt::AlignLeft && Qt::AlignTop);
ui->dishTableWidget->item(0, 0)->setFlags(ui->dishTableWidget->item(0, 0)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
ui->dishTableWidget->setItem(0, 2, new QTableWidgetItem(QString())); // 价格
ui->dishTableWidget->item(0, 2)->setTextAlignment(Qt::AlignCenter);
ui->dishTableWidget->item(0, 2)->setFlags(ui->dishTableWidget->item(0, 2)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
ui->dishTableWidget->setItem(0, 1, new QTableWidgetItem(QString())); // 数量
ui->dishTableWidget->item(0, 1)->setTextAlignment(Qt::AlignCenter);
ui->dishTableWidget->item(0, 1)->setFlags(ui->dishTableWidget->item(0, 1)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
ui->dishTableWidget->insertRow(0);
}
ui->dishTableWidget->setItem(0, 0, new QTableWidgetItem(name)); // 商品名
ui->dishTableWidget->item(0, 0)->setTextAlignment(Qt::AlignLeft);
ui->dishTableWidget->item(0, 0)->setFlags(ui->dishTableWidget->item(0, 0)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
ui->dishTableWidget->setItem(0, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->price/100.0))); // 价格
ui->dishTableWidget->item(0, 2)->setTextAlignment(Qt::AlignCenter);
ui->dishTableWidget->item(0, 2)->setFlags(ui->dishTableWidget->item(0, 2)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
ui->dishTableWidget->setItem(0, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量
ui->dishTableWidget->item(0, 1)->setTextAlignment(Qt::AlignCenter);
ui->dishTableWidget->item(0, 1)->setFlags(ui->dishTableWidget->item(0, 1)->flags() & ~Qt::ItemIsEnabled & ~Qt::ItemIsSelectable);
}
ui->product_numLb->setText(QString::number(orderObject->total_amount)); ui->product_numLb->setText(QString::number(orderObject->total_amount));
ui->product_price_Lb->setText(QString::number(orderObject->total_fee/100.0)); ui->product_price_Lb->setText(QString::number(orderObject->total_fee/100.0));
...@@ -185,16 +221,16 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag) ...@@ -185,16 +221,16 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
ui->detailBtn3->setText(btn3name); ui->detailBtn3->setText(btn3name);
ui->detailBtn3->setProperty("operation", btn3opt); ui->detailBtn3->setProperty("operation", btn3opt);
if(btn3opt == OPERATIONNAME_COMPLETE) { if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_COMPLETE)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3opt == OPERATIONNAME_SENDOUT) { } else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_SENDOUT)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3opt == OPERATIONNAME_GETDELIVERS) { } else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_GETDELIVERS)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 169, 115);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 169, 115);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3opt == OPERATIONNAME_MAKEOVER) { } else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_MAKEOVER)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3opt == OPERATIONNAME_REFUNDORDER) { } else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_REFUNDORDER)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} }
} }
else else
...@@ -208,10 +244,10 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag) ...@@ -208,10 +244,10 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
ui->detailBtn2->setText(btn2name); ui->detailBtn2->setText(btn2name);
ui->detailBtn2->setProperty("operation", btn2opt); ui->detailBtn2->setProperty("operation", btn2opt);
if(btn2opt == OPERATIONNAME_REFUNDNEWORDER) { if(btn2name == QString::fromLocal8Bit(OPERATIONNAME_REFUNDNEWORDER)) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn2opt == OPERATIONNAME_REFUSEREFUND) { } else if(btn2name == QString::fromLocal8Bit(OPERATIONNAME_REFUSEREFUND)) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}")); ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} }
} }
else else
...@@ -510,3 +546,8 @@ void NewDetailForm::on_detailBtn0_clicked() ...@@ -510,3 +546,8 @@ void NewDetailForm::on_detailBtn0_clicked()
{ {
} }
void NewDetailForm::on_closeButton_clicked()
{
this->close();
}
takeout/view/newdetailform.h
...@@ -86,6 +86,7 @@ private slots: ...@@ -86,6 +86,7 @@ private slots:
* */ * */
bool getOtherOrderOptAndName(OrderObject *order, QString &optname, QString &name); bool getOtherOrderOptAndName(OrderObject *order, QString &optname, QString &name);
void on_closeButton_clicked();
}; };
#endif // NEWDETAILFORM_H #endif // NEWDETAILFORM_H
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