1. 微调表格样式。

sbkpay/hostwidget.cpp

@@ -12,7 +12,8 @@
 
 HostWidget::HostWidget(QWidget *parent) :
     FMPWindow(parent),
-    ui(new Ui::HostWidget)
+    ui(new Ui::HostWidget),
+    _currPayStr("")
 {
     ui->setupUi(this);
 
@@ -59,9 +60,8 @@ HostWidget::HostWidget(QWidget *parent) :
 
     ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
-    //ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+//    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tableWidget->verticalHeader()->setDefaultSectionSize(45);
-
     for(int r=0; r<10; r++) {
         ui->tableWidget->insertRow(r);
     }
@@ -271,7 +271,7 @@ void HostWidget::ShowWithRequest(AlipayRequest request)
 
 void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 {
-#ifdef FMTEST
+#ifdef FMTEST_DATA
     flag = true;
     object[JSON_KEY_STATUSCODE] = 100;
     object[JSON_KEY_TOTALNUM] = 10;
@@ -281,7 +281,8 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
         queryObj[JSON_KEY_FMID] = "13131712271000005006";
         queryObj[JSON_KEY_FMID] = "13131712271000005006";
     } else {
-        queryObj[JSON_KEY_CODE] = "7310180806223610";
+        queryObj[JSON_KEY_CODE] = "7310180806223610\n2432342342\n2434223423\n1231231231";
+//        queryObj[JSON_KEY_CODE] = "7310180806223610, 2432342342, 2434223423, 1231231231, 1231231231, 1231231231, 1231231231, 1231231231, 1231231231";
         queryObj[JSON_KEY_AUTHCODE] = "856875";
         queryObj[JSON_KEY_SALENO] = "500389";
     }
@@ -290,6 +291,15 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
     queryObj[JSON_KEY_STATE] = 1;
     queryObj[JSON_KEY_STATEMSG] = QString::fromLocal8Bit("成功");
     queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
+    queryInfo.append(queryObj);
     object[JSON_KEY_QUERYINFO] = queryInfo;
 #endif
     ui->widget_check_load->hide();
@@ -298,8 +308,6 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 
     _need_exit = true;
 
-    QString currPayStr = ui->comBox_payment_method->currentText();
-
     QLOG_INFO() << object;
 
     if(!flag)
@@ -333,7 +341,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                 QJsonObject tmp = val.toObject();
 
                 QStringList itemDataList;
-                if(_paymentMethodsMapThird.contains(currPayStr)) {
+                if(_paymentMethodsMapThird.contains(_currPayStr)) {
                     itemDataList << tmp[JSON_KEY_FMID].toString();
                 } else {
                     itemDataList << tmp[JSON_KEY_CODE].toString()
@@ -344,12 +352,15 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                              << tmp[JSON_KEY_TRANSTIME].toString()
                              << tmp[JSON_KEY_STATEMSG].toString();
 
-
-                ui->tableWidget->insertRow(row);
                 for(col=0; col<itemDataList.length(); col++)
                 {
                     QTableWidgetItem *item = new QTableWidgetItem(itemDataList.at(col));
-                    item->setTextAlignment(Qt::AlignCenter);
+                    if(col == 0) {
+                        item->setTextAlignment(Qt::AlignLeft);
+                    } else {
+                        item->setTextAlignment(Qt::AlignCenter);
+                    }
+                    item->setFont(QFont("Microsoft YaHei UI Light", 15));
                     ui->tableWidget->setItem(row, col, item);
                 }
 //                QTableWidgetItem *item0 = new QTableWidgetItem(tmp[JSON_KEY_FMID].toString());
@@ -377,7 +388,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 //                    ui->tableWidget->setItem(0, 4, item4);
 //                }
 
-                if(_posType != SPCC && (currPayStr==QString::fromLocal8Bit("微信支付") || currPayStr==QString::fromLocal8Bit("支付宝"))) {
+                if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("微信支付") || _currPayStr==QString::fromLocal8Bit("支付宝"))) {
                     QWidget *pWdg = new QWidget(ui->tableWidget);
                     QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
                     QPushButton * pBtn = new QPushButton(pWdg);
@@ -408,11 +419,18 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                         emit RequestWithType(againprint, list);
                     });
 
-                    row ++;
                 }
+                row ++;
+            }
 
+            // 根据时间所在列排序
+            int sortColumn = 2;
+            if(ui->tableWidget->columnCount() == 6) {
+                sortColumn = 4;
             }
-            ui->tableWidget->sortByColumn(2, Qt::DescendingOrder);
+            ui->tableWidget->sortByColumn(sortColumn, Qt::DescendingOrder);
+
+            ui->tableWidget->resizeRowsToContents();
             ui->tableWidget->show();
         }
     }
@@ -878,12 +896,12 @@ void HostWidget::SetTableWidgetHeader()
     QStringList headerString;
     QList<double> widthScale;
 
-    QString currPayStr = ui->comBox_payment_method->currentText();
+    _currPayStr = ui->comBox_payment_method->currentText();
 
-    if(_paymentMethodsMapThird.contains(currPayStr)) {
+    if(_paymentMethodsMapThird.contains(_currPayStr)) {
         headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态");
         // 只有微信支付和支付宝支付有操作列，且商户不是SPCC
-        if(_posType != SPCC && (currPayStr==QString::fromLocal8Bit("支付宝")||currPayStr==QString::fromLocal8Bit("微信支付"))) {
+        if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("支付宝")||_currPayStr==QString::fromLocal8Bit("微信支付"))) {
             headerString << QString::fromLocal8Bit("操作");
         }
     } else {
@@ -898,7 +916,7 @@ void HostWidget::SetTableWidgetHeader()
         widthScale << 0.35 << 0.15 << 0.21 << 0.15 << 0.14;
         break;
     case 6:
-        widthScale << 0.32 << 0.13 << 0.18 << 0.13 << 0.12 << 0.12;
+        widthScale << 0.27 << 0.13 << 0.13 << 0.13 << 0.20 << 0.12;
         break;
     default:
         break;

sbkpay/hostwidget.h

@@ -132,6 +132,7 @@ private:
     ReqType _type;
 
     QMap<QString, QString> _paymentMethodsMapThird, _paymentMethodsMapCoupon;
+    QString _currPayStr;
 };
 
 #endif // HOSTWIDGET_H

sbkpay/hostwidget.ui

@@ -878,11 +878,14 @@ QHeaderView::section{
 </string>
            </property>
            <property name="verticalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
+            <enum>Qt::ScrollBarAsNeeded</enum>
            </property>
            <property name="horizontalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
+           <property name="textElideMode">
+            <enum>Qt::ElideNone</enum>
+           </property>
            <attribute name="horizontalHeaderHighlightSections">
             <bool>true</bool>
            </attribute>

tests/TestSimphony/tst_testsimphony.cpp

@@ -206,7 +206,7 @@ void TestSimphony::test_POSRequest_data()
 {
     QTest::addColumn<QByteArray>("ReqData");
 
-    QTest::newRow("Manage") << QString("{\"reqType\":351,\"storeId\":\"1713\",\"stationId\":\"1\",\"partnerId\":1438}")
+    QTest::newRow("Manage") << QString("{\"reqType\":351,\"storeId\":\"16171\",\"stationId\":\"1\",\"partnerId\":1438}")
                                .toLocal8Bit();
 
     int amount = 200;