Skip to content

F
fmtakeout
Commit dfaf2311 by xiaoqing.gu
Options

Merge branch 'feature/improve' into develop

parents d947008d 81a4e522
Showing with 74 additions and 31 deletions
takeout/view/newdetailform.cpp
#include "newdetailform.h"
#include "ui_newdetailform.h"
#include <QDateTime>
#include <QPushButton>
#include "preDefine.h"
#include "base/Arithmetic/util.h"
#include "base/Config/configManger.h"
......@@ -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("(元)"))));
*/
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;
// 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())
......@@ -122,19 +123,19 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
*/
//商品如果有规格的话，商品的规格显示在单元格的第二行，并且字体颜色都有限制
if(!property_tags.isEmpty()) {
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)));
}
// if(!property_tags.isEmpty()) {
// 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)));
// }
ui->dishTableWidget->setItem(i, 0, new QTableWidgetItem(name)); // 商品名
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->item(i, 2)->setTextAlignment(Qt::AlignCenter);
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->setItem(i, 0, new QTableWidgetItem(name)); // 商品名
// 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->item(i, 2)->setTextAlignment(Qt::AlignCenter);
// ui->dishTableWidget->setItem(i, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量
// ui->dishTableWidget->item(i, 1)->setTextAlignment(Qt::AlignCenter);
// }
//商品汇总信息显示在tablewidget中
// ui->sumTableWidget->setItem(0, 0, new QTableWidgetItem(QString::number(orderObject->total_amount)));
......@@ -151,6 +152,41 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
// ui->sumTableWidget->setItem(3, 1, new QTableWidgetItem(QString::number(dis_amount)));
// 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_price_Lb->setText(QString::number(orderObject->total_fee/100.0));
......@@ -185,16 +221,16 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
ui->detailBtn3->setText(btn3name);
ui->detailBtn3->setProperty("operation", btn3opt);
if(btn3opt == OPERATIONNAME_COMPLETE) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}"));
} else if(btn3opt == OPERATIONNAME_SENDOUT) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";}"));
} else if(btn3opt == OPERATIONNAME_GETDELIVERS) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 169, 115);color:white;font: 9pt \"微软雅黑\";}"));
} else if(btn3opt == OPERATIONNAME_MAKEOVER) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";}"));
} else if(btn3opt == OPERATIONNAME_REFUNDORDER) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}"));
if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_COMPLETE)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_SENDOUT)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_GETDELIVERS)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 169, 115);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_MAKEOVER)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(0, 109, 171);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn3name == QString::fromLocal8Bit(OPERATIONNAME_REFUNDORDER)) {
ui->detailBtn3->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
}
}
else
......@@ -208,10 +244,10 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
ui->detailBtn2->setText(btn2name);
ui->detailBtn2->setProperty("operation", btn2opt);
if(btn2opt == OPERATIONNAME_REFUNDNEWORDER) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}"));
} else if(btn2opt == OPERATIONNAME_REFUSEREFUND) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";}"));
if(btn2name == QString::fromLocal8Bit(OPERATIONNAME_REFUNDNEWORDER)) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
} else if(btn2name == QString::fromLocal8Bit(OPERATIONNAME_REFUSEREFUND)) {
ui->detailBtn2->setStyleSheet(QString::fromLocal8Bit("QPushButton{background-color:rgb(255, 43, 42);color:white;font: 9pt \"微软雅黑\";border-radius: 5px;}"));
}
}
else
......@@ -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:
* */
bool getOtherOrderOptAndName(OrderObject *order, QString &optname, QString &name);
void on_closeButton_clicked();
};
#endif // NEWDETAILFORM_H
takeout/view/newdetailform.ui
......@@ -103,7 +103,8 @@
#closeBtn
{
border-image: url(:detailBtn_close_normal.png);
border-image: url(:newmainhide.png);
border:0px solid;
}
#productLb,#product_numLb,#product_price_Lb,#packageLb,#package_num_Lb,#package_price_Lb,#deliveryLb,#delivery_num_Lb,#delivery_price_Lb,#promotionLb,#promotion_num_Lb,#promotion_price_Lb
......
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