打印字段调试

fmPrinter/fmPrinter.cpp

@@ -65,7 +65,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     while(listIte.hasNext())
     {
         ProductObject * pObj = listIte.next();
-        //map.insert(pObj->bsk_num, pObj);
+        map.insert("1", pObj);
     }
     int index = 0;
     int count = map.uniqueKeys().count();
@@ -108,9 +108,9 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
 
         result_str.append("#"+QString::number(pData->order_index));
         result_str.append("|");
-        result_str.append(pData->channelName);
+        result_str.append(pData->channel_name);
         result_str.append("|");
-        result_str.append(storename);
+        result_str.append("storename");
         result_str.append("|");
         result_str.append(pData->pay_type);
         result_str.append("|");
@@ -118,11 +118,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         result_str.append("|");
         result_str.append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"));
         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"):QString::fromLocal8Bit("立即送达"));
         result_str.append("|");
         result_str.append(pData->remark.isEmpty()?"null":QString("备注："+pData->remark));
         result_str.append("|");
-        result_str.append(pData->has_invoiced?"是": "null");
+        result_str.append(pData->has_invoiced?QString::fromLocal8Bit("是"): "null");
 
         QString strTitle("null"), strNum("null");
         if(pData->has_invoiced)
@@ -157,7 +157,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         result_str.append("|");
         result_str.append(_Penny2Dollar(pData->product_fee));
         result_str.append("|");
-        result_str.append(QString("地址：")+pData->address);
+        result_str.append(QString::fromLocal8Bit("地址：")+pData->address);
         result_str.append("|");
         result_str.append(pData->customer);
         result_str.append("|");

takeout/model/orderObject.cpp

@@ -164,11 +164,11 @@ void OrderObject::setChannel(const QString &v)
 
 QString OrderObject::getchannelName() const
 {
-    return channelName;
+    return channel_name;
 }
 void OrderObject::setchannelName(const QString &v)
 {
-    channelName = v;
+    channel_name = v;
 }
 
 QString OrderObject::getphone() const

takeout/model/orderObject.h

@@ -21,7 +21,7 @@ public:
 
 public:
     Q_PROPERTY (QString channel READ getChannel WRITE setChannel)
-    Q_PROPERTY (QString channelName READ getchannelName WRITE setchannelName)
+    Q_PROPERTY (QString channel_name READ getchannelName WRITE setchannelName)
     Q_PROPERTY (QString phone READ getphone WRITE setphone)
     Q_PROPERTY (QString address READ getaddress WRITE setaddress)
     Q_PROPERTY (QString customer READ getcustomer WRITE setcustomer)
@@ -76,7 +76,7 @@ public:
 
     QString address;         //地址
     QString channel;         //渠道
-    QString channelName;     //渠道名称
+    QString channel_name;     //渠道名称
     QString customer;        //用户姓名
     QString customer_code;    //取餐码
     QString coupon;          //码

takeout/view/mainForm.cpp

@@ -487,7 +487,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
     tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
     table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
     table->insertRow(0);
-    QTableWidgetItem *item0 = new QTableWidgetItem(QString::number(orderObject->order_index)+"#"+orderObject->channelName);
+    QTableWidgetItem *item0 = new QTableWidgetItem(QString::number(orderObject->order_index)+"#"+orderObject->channel_name);
     item0->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 0, item0);  // 渠道
     QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->order_id);