修改提交

.gitignore

 *.user
-*.autosave
\ No newline at end of file
+*.autosave
+*build*
\ No newline at end of file

fmPrinter/fmPrinter.cpp

@@ -63,7 +63,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     for(int i=0; i<pData->proList.count(); i++)
     {
         QString name, price;
-        name = pData->proList[i]->name;
+        name = pData->proList[i]->name + "[" + pData->proList[i]->property_tags + "]";
         //test
         //        if(printsize==56)
         //        {

fmTakeaway/Model/productObject.cpp

@@ -18,6 +18,26 @@ void ProductObject::FromJson(const QJsonObject &json)
     return;
 }
 
+QString ProductObject::getproperty_tags() const
+{
+    return property_tags;
+}
+
+void ProductObject::setproperty_tags(const QString &v)
+{
+    property_tags = v;
+}
+
+QString ProductObject::getspec_name() const
+{
+    return spec_name;
+}
+
+void ProductObject::setspec_name(const QString &v)
+{
+    spec_name = v;
+}
+
 int ProductObject::getpack_charge() const
 {
     return pack_charge;

fmTakeaway/Model/productObject.h

@@ -26,10 +26,14 @@ public:
     Q_PROPERTY (int unit_ratio READ getunit_ratio WRITE setunit_ratio)
     Q_PROPERTY (QString stock_barcode READ getstock_barcode WRITE setstock_barcode)
     Q_PROPERTY (int pack_charge READ getpack_charge WRITE setpack_charge)
+    Q_PROPERTY (QString spec_name READ getspec_name WRITE setspec_name)
+    Q_PROPERTY (QString property_tags READ getproperty_tags WRITE setproperty_tags)
 
     QString pid;
     QString name;
     QString upc;
+    QString spec_name;                  //规格名称
+    QString property_tags;              //属性描述
     int price;
     int productAmount;
 
@@ -43,6 +47,12 @@ public:
 
 protected:
 
+    QString getproperty_tags() const;
+    void setproperty_tags(const QString& v);
+
+    QString getspec_name() const;
+    void setspec_name(const QString& v);
+
     int getpack_charge() const;
     void setpack_charge(const int& v);
 

fmTakeaway/detailForm.cpp

@@ -63,7 +63,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     for(int i=0; i<orderObject->proList.count(); i++)
     {
         ui->detailTable0->insertRow(i);
-        ui->detailTable0->setItem(i, 0, new QTableWidgetItem(orderObject->proList.at(i)->name));  // 商品名
+        ui->detailTable0->setItem(i, 0, new QTableWidgetItem(orderObject->proList.at(i)->name+"["+orderObject->proList.at(i)->property_tags+"]"));  // 商品名
         ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter);
         ui->detailTable0->setItem(i, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price)));  // 价格
         ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter);