1.新界面主界面初步开发完成;2.修复了一些翻页的bug

takeout/view/mainbtn.cpp

@@ -24,7 +24,7 @@ void MainBtn::setChecked(bool check)
 
     QString type =  this->property("type").toString();
 
-    qDebug() << "====" << type << ";" << check << _type;
+    //qDebug() << "====" << type << ";" << check << _type;
 
     if(type.compare("order",Qt::CaseInsensitive) == 0)
     {

takeout/view/mainbtn.ui

@@ -6,19 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>240</width>
+    <width>160</width>
     <height>80</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>240</width>
+    <width>160</width>
     <height>80</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>240</width>
+    <width>160</width>
     <height>80</height>
    </size>
   </property>
@@ -62,7 +62,7 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>38</width>
+       <width>16</width>
        <height>20</height>
       </size>
      </property>

takeout/view/newmainform.cpp

@@ -66,7 +66,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
     order.status = NewOrder;
     order.refund_status = DefaultOrder;
     order.order_id = "0";
-    order.order_index = 8;
+    order.order_index = 0;
     order.channel_name = "hungry";
     order.phone = "66666666";
     order.customer = "ldd";
@@ -75,102 +75,102 @@ NewMainForm::NewMainForm(QWidget *parent) :
     OrderObject order1;
     order1.status = FirmOrder;
     order1.refund_status = DefaultOrder;
-    order1.order_id = "1";
+    order1.order_index = 1;
     InsertTableWidget(order1);
     OrderObject order2;
     order2.status = FirmOrder;
     order2.refund_status = ApplicationRefundOrder;
-    order2.order_id = "2";
+    order2.order_index = 2;
     InsertTableWidget(order2);
     OrderObject order3;
     order3.status = InDevelopment;
     order3.refund_status = DefaultOrder;
-    order3.order_id = "3";
+    order3.order_index = 3;
     InsertTableWidget(order3);
     OrderObject order4;
     order4.status = InDevelopment;
     order4.refund_status = DefaultOrder;
-    order4.order_id = "4";
+    order4.order_index = 4;
     InsertTableWidget(order4);
     OrderObject order5;
     order5.status = InDevelopment;
     order5.refund_status = DefaultOrder;
-    order5.order_id = "5";
+    order5.order_index = 5;
     InsertTableWidget(order5);
     OrderObject order6;
     order6.status = InDevelopment;
     order6.refund_status = DefaultOrder;
-    order6.order_id = "6";
+    order6.order_index = 6;
     InsertTableWidget(order6);
     OrderObject order7;
     order7.status = InDevelopment;
     order7.refund_status = DefaultOrder;
-    order7.order_id = "7";
+    order7.order_index = 7;
     InsertTableWidget(order7);
     OrderObject order8;
     order8.status = InDevelopment;
     order8.refund_status = DefaultOrder;
-    order8.order_id = "8";
+    order8.order_index = 8;
     InsertTableWidget(order8);
     OrderObject order9;
     order9.status = InDevelopment;
     order9.refund_status = DefaultOrder;
-    order9.order_id = "9";
+    order9.order_index = 9;
     InsertTableWidget(order9);
     OrderObject order10;
     order10.status = InDevelopment;
     order10.refund_status = DefaultOrder;
-    order10.order_id = "10";
+    order10.order_index = 10;
     InsertTableWidget(order10);
     OrderObject order11;
     order11.status = InDevelopment;
     order11.refund_status = DefaultOrder;
-    order11.order_id = "11";
+    order11.order_index = 11;
     InsertTableWidget(order11);
     OrderObject order12;
     order12.status = InDevelopment;
     order12.refund_status = DefaultOrder;
-    order12.order_id = "12";
+    order12.order_index = 12;
     InsertTableWidget(order12);
     OrderObject order13;
     order13.status = InDevelopment;
     order13.refund_status = DefaultOrder;
-    order13.order_id = "13";
+    order13.order_index = 13;
     InsertTableWidget(order13);
     OrderObject order14;
     order14.status = InDevelopment;
     order14.refund_status = DefaultOrder;
-    order14.order_id = "14";
+    order14.order_index = 14;
     InsertTableWidget(order14);
     OrderObject order15;
     order15.status = InDevelopment;
     order15.refund_status = DefaultOrder;
-    order15.order_id = "15";
+    order15.order_index = 15;
     InsertTableWidget(order15);
     OrderObject order16;
     order16.status = InDevelopment;
     order16.refund_status = DefaultOrder;
-    order16.order_id = "16";
+    order16.order_index = 16;
     order16.order_type = AppointmentTakeout;
     InsertTableWidget(order16);
     OrderObject order17;
     order17.status = InDevelopment;
     order17.refund_status = DefaultOrder;
-    order17.order_id = "17";
+    order17.order_index = 17;
     order17.order_type = LockOrder;
-    order17.status = DispatchingOrder;
+    order17.status = CompleteOrder;
     InsertTableWidget(order17);
     OrderObject order18;
     order18.status = InDevelopment;
     order18.refund_status = DefaultOrder;
-    order18.order_id = "18";
+    order18.order_index = 18;
     order18.order_type = AppointmentTakeout;
     order18.status = DispatchingOrder;
     InsertTableWidget(order18);
     OrderObject order19;
     order19.status = InDevelopment;
     order19.refund_status = DefaultOrder;
-    order19.order_id = "19";
+    order19.order_index = 19;
     order19.order_type = AppointmentTakeout;
     order19.status = FirmOrder;
     InsertTableWidget(order19);
@@ -178,7 +178,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
     order20.order_type = AppointmentTakeout;
     order20.status = InDevelopment;
     order20.refund_status = DefaultOrder;
-    order20.order_id = "20";
+    order20.order_index = 20;
     order20.order_type = AppointmentTakeout;
     order20.status = NewOrder;
     InsertTableWidget(order20);
@@ -187,7 +187,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
     order21.order_type = AppointmentTakeout;
     order21.status = InDevelopment;
     order21.refund_status = DefaultOrder;
-    order21.order_id = "21";
+    order21.order_index = 21;
     order21.order_type = AppointmentTakeout;
     order21.status = NewOrder;
     InsertTableWidget(order21);
@@ -195,52 +195,28 @@ NewMainForm::NewMainForm(QWidget *parent) :
     OrderObject order22;
     order22.order_type = AppointmentTakeout;
     order22.status = InDevelopment;
-    order22.refund_status = DefaultOrder;
+    order22.refund_status = CompleteRefundOrder;
+    order22.order_index = 22;
     order22.order_id = "22";
     order22.order_type = AppointmentTakeout;
     order22.status = NewOrder;
-    InsertTableWidget(order20);
+    InsertTableWidget(order22);
 
     OrderObject order23;
     order23.order_type = AppointmentTakeout;
     order23.status = InDevelopment;
     order23.refund_status = DefaultOrder;
+    order23.order_index = 23;
     order23.order_id = "23";
     order23.order_type = AppointmentTakeout;
     order23.status = NewOrder;
-    InsertTableWidget(order23);
-
-    OrderObject order24;
-    order24.order_type = AppointmentTakeout;
-    order24.status = InDevelopment;
-    order24.refund_status = DefaultOrder;
-    order24.order_id = "24";
-    order24.order_type = AppointmentTakeout;
-    order24.status = CompleteOrder;
-    InsertTableWidget(order24);
-
-    OrderObject order25;
-    order25.order_type = AppointmentTakeout;
-    order25.status = InDevelopment;
-    order25.refund_status = CompleteRefundOrder;
-    order25.order_id = "25";
-    order25.order_type = AppointmentTakeout;
-    order25.status = NewOrder;
-    InsertTableWidget(order25);
-
-    OrderObject order26;
-    order26.order_type = AppointmentTakeout;
-    order26.status = InDevelopment;
-    order26.refund_status = DefaultOrder;
-    order26.order_id = "26";
-    order26.order_type = AppointmentTakeout;
-    order26.status = ServiceOrder;
-    InsertTableWidget(order26);
+    InsertTableWidget(order23); 
     //------------------------------------------test
 #endif
 
 
 
+
     FMApplication::subscibeEvent(this, PosEvent::s_login_status);
     FMApplication::subscibeEvent(this, PosEvent::s_opt_status);
     FMApplication::subscibeEvent(this, PosEvent::s_change_order);
@@ -265,15 +241,19 @@ void NewMainForm::InitPageNum()
 
     int page =  _curr_page_num/(num - 1) ;
 
-    if(ui->newmaintablewidget_order->rowCount()%(num - 1) != 0)
+    if(_curr_page_num %(num - 1) != 0)
         ++ page;
 
-    qDebug() << "+++++++" << num << ";" << page;
+    //qDebug() << "+++++++" << num << ";" << "page" << page << ";" << _curr_page_num;
 
     _curr_page = 1;
     ui->newmaintablewidget_order->verticalScrollBar()->setValue(0);
     ui->newmainlabel_allnum->setText(QString::fromUtf8("\xE5\x85\xB1%1\xE6\x9D\xA1").arg(QString::number(_curr_page_num)));
-    ui->newmainlabel_page->setText(QString::number(_curr_page)+ "/" + QString::number(page));
+    if (page != 0)
+        ui->newmainlabel_page->setText(QString::number(_curr_page)+ "/" + QString::number(page));
+    else
+        ui->newmainlabel_page->setText(QString::number(_curr_page)+ "/" + QString("1"));
+    ui->newmaintablewidget_order->viewport()->setFixedHeight((num - 1) * 36);
 }
 
 void NewMainForm::InitPrtList()
@@ -362,6 +342,7 @@ bool NewMainForm::ClassifyOrder(QString type)
         ClassifyOrderWithOrderStatus(CompleteOrder);
         break;
     case TYPE_FUTURE:
+        ClassifyOrderWithOrderType();
         break;
     default:
         return false;
@@ -369,6 +350,28 @@ bool NewMainForm::ClassifyOrder(QString type)
     return true;
 }
 
+void NewMainForm::ClassifyOrderWithOrderType()
+{
+    _curr_page_num = 0;
+    QTableWidget *table = ui->newmaintablewidget_order;
+    for(int i=0; i<table->rowCount(); i++)
+    {
+        OrderTypeForm *pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+
+        if(pwd->order_type() == AppointmentTakeout ||
+                pwd->order_type() == AppointmentDining ||
+                pwd->order_type() == AppointmentInvite)
+        {
+            table->setRowHidden(i, false);
+            ++_curr_page_num;
+        }
+        else
+        {
+            table->setRowHidden(i, true);
+        }
+    }
+}
+
 void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
 {
     _curr_page_num = 0;
@@ -380,8 +383,17 @@ void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
 
         switch (order_status) {
         case DefaultOrder:
-            table->setRowHidden(i, false);
-            ++_curr_page_num;
+            pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+            if(pwd->GetOrderStatus() == NewOrder || pwd->GetOrderStatus() == FirmOrder ||
+                    pwd->GetOrderStatus() == DispatchingOrder || pwd->GetOrderStatus() == DispatchingOrder ||
+                    pwd->GetOrderStatus() == InDevelopment || pwd->GetOrderStatus() == CompleteOrder ||
+                    pwd->GetOrderStatus() == ServiceOrder)
+            {
+                table->setRowHidden(i, false);
+                ++_curr_page_num;
+            }
+            else
+                table->setRowHidden(i, true);
             break;
         case NewOrder:
             pwd = (OrderTypeForm *)table->cellWidget(i, 1);
@@ -439,6 +451,7 @@ void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
         case ApprovalRefundOrder:
         case CompleteRefundOrder:
             pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+            //qDebug()<<"-----" << pwd->GetOrderStatus() << ";" << pwd->order_id() << ";" << pwd->refund_status() << ";" << pwd->order_status();
             if(pwd->GetOrderStatus() == ApprovalRefundOrder || pwd->GetOrderStatus() == CompleteRefundOrder
                     || pwd->GetOrderStatus() == LockOrder || pwd->GetOrderStatus() == CancelOrder)
             {
@@ -451,7 +464,7 @@ void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
         case CompleteOrder:
         case ServiceOrder:
             pwd = (OrderTypeForm *)table->cellWidget(i, 1);
-            if(pwd->GetOrderStatus() == CompleteOrder)
+            if(pwd->GetOrderStatus() == CompleteOrder || pwd->GetOrderStatus() == ServiceOrder)
             {
                 table->setRowHidden(i, false);
                 ++_curr_page_num;
@@ -487,7 +500,7 @@ void NewMainForm::SetMainBtnCheck(MainBtn *wgt)
         else
             var->setChecked(false);
 
-        qDebug() << "&&&&&&&&&&&&" << var->property("type").toString();
+        //qDebug() << "&&&&&&&&&&&&" << var->property("type").toString();
     }
 }
 
@@ -532,9 +545,16 @@ bool NewMainForm::event(QEvent *e)
 
         Order_Index tmp = {order.status, order.refund_status};
         
-        _order_indexs.insert(order.order_id, tmp);
-
-        UpdateTableWidget(order);
+        if(_order_indexs.contains(order.order_id))
+        {
+            _order_indexs.insert(order.order_id, tmp);
+            UpdateTableWidget(order);
+        }
+        else
+        {
+            _order_indexs.insert(order.order_id, tmp);
+            InsertTableWidget(order);
+        }
 
         return true;
     }
@@ -562,11 +582,14 @@ bool NewMainForm::event(QEvent *e)
 
         GETEVENTINFO(value,e,QVariantMap);
 
-        if(value.contains(EVENT_KEY_ORDERID) && value.contains(EVENT_KEY_ORDERSTATUS))
-            ;
+        if(value.contains(EVENT_KEY_ORDERID) && !value[EVENT_KEY_ORDERID].toString().isEmpty() &&
+                _order_indexs.contains(value[EVENT_KEY_ORDERID].toString()))
+        {
+            DeleteTableWidget(value[EVENT_KEY_ORDERID].toString());
+            _order_indexs.remove(value[EVENT_KEY_ORDERID].toString());
+        }
         return true;
     }
-
     return QWidget::event(e);
 }
 
@@ -579,7 +602,7 @@ void NewMainForm::SetChecked(QPushButton *btn)
             var->setChecked(true);
             ClassifyOrder(_curr_check_btn->property("type").toString());
 
-            qDebug() << "------" << _curr_page_num;
+            //qDebug() << "------" << _curr_page_num;
 
             InitPageNum();
         }
@@ -592,7 +615,36 @@ void NewMainForm::SetChecked(QPushButton *btn)
 
 void NewMainForm::UpdateTableWidget(OrderObject &orderObject)
 {
+    QTableWidget *table = ui->newmaintablewidget_order;
+    for(int i=0; i<table->rowCount(); i++)
+    {
+        OrderTypeForm *pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+
+        if(orderObject.order_id.compare(pwd->order_id()) == 0)
+        {
+            pwd->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
+            break;
+        }
+    }
 
+    ClassifyOrder(_curr_check_btn->property("type").toString());
+}
+
+void NewMainForm::DeleteTableWidget(QString orderid)
+{
+    QTableWidget *table = ui->newmaintablewidget_order;
+    for(int i=0; i<table->rowCount(); i++)
+    {
+        OrderTypeForm *pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+
+        if(orderid.compare(pwd->order_id()) == 0)
+        {
+            table->removeRow(i);
+            break;
+        }
+    }
+
+    ClassifyOrder(_curr_check_btn->property("type").toString());
 }
 
 void NewMainForm::InitTableWidget()
@@ -611,34 +663,36 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
     table->setItem(0, 0, item);  //序号
     OrderTypeForm *pWdg = new OrderTypeForm(table);
     pWdg->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
+    //pWdg->InitShow(QString::number(orderObject.order_index), orderObject.status, orderObject.refund_status, orderObject.order_type);
 
     table->setCellWidget(0, 1, pWdg); //订单状态
     QTableWidgetItem *item0 = new QTableWidgetItem(QString::number(orderObject.order_index));
     item0->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 2, item0);  // 渠道
-    QTableWidgetItem *item1 = new QTableWidgetItem(orderObject.order_id);
-    item1->setTextAlignment(Qt::AlignCenter);
-    table->setItem(0, 3, item1);  // 订单ID
+//    QTableWidgetItem *item1 = new QTableWidgetItem(orderObject.order_id);
+//    item1->setTextAlignment(Qt::AlignCenter);
+//    table->setItem(0, 3, item1);  // 订单ID
     QTableWidgetItem *item2 = new QTableWidgetItem(QString::number(orderObject.shop_fee/100.0));
     item2->setTextAlignment(Qt::AlignCenter);
-    table->setItem(0, 4, item2);  // 金额
+    table->setItem(0, 3, item2);  // 金额
     QTableWidgetItem *item3 = new QTableWidgetItem(orderObject.customer);
     item3->setTextAlignment(Qt::AlignCenter);
-    table->setItem(0, 5, item3);  // 姓名
+    table->setItem(0, 4, item3);  // 姓名
     QTableWidgetItem *item4 = new QTableWidgetItem(orderObject.phone);
     item4->setTextAlignment(Qt::AlignCenter);
-    table->setItem(0, 6, item4);  // 联系方式
-    QTableWidgetItem *item5 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject.create_time).toString("MM-dd hh:mm"));
-    item5->setTextAlignment(Qt::AlignCenter);
-    table->setItem(0, 7, item5);  // 下单时间
-    table->setRowHeight(0, 36);
+    table->setItem(0, 5, item4);  // 联系方式
+//    QTableWidgetItem *item5 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject.create_time).toString("MM-dd hh:mm"));
+//    item5->setTextAlignment(Qt::AlignCenter);
+//    table->setItem(0, 6, item5);  // 下单时间
+
     OrderOptForm *form = new OrderOptForm(table);
-    table->setCellWidget(0, 8, form); //订单操作
+    table->setCellWidget(0, 6, form); //订单操作
 
-    qDebug() << _curr_check_btn->property("type").toString();
+    //qDebug() << _curr_check_btn->property("type").toString();
 
     ClassifyOrder(_curr_check_btn->property("type").toString());
 
+    table->setRowHeight(0, 36);
 }
 
 void NewMainForm::GetOrderStatus(OrderObject &order, int &order_status)
@@ -666,6 +720,7 @@ void NewMainForm::InitOrderWidget(QString type)
         ui->newmainbtn_send->show();
         SetMainBtnCheck(ui->newmainbtn_order);
         SetChecked(ui->newmainbtn_all);
+        _curr_check_btn = ui->newmainbtn_all;
     }
     else if(type.compare(MAIN_REFUND, Qt::CaseInsensitive) == 0)
     {
@@ -680,6 +735,7 @@ void NewMainForm::InitOrderWidget(QString type)
         ui->newmainbtn_send->hide();
         SetMainBtnCheck(ui->newmainbtn_refund);
         SetChecked(ui->newmainbtn_needrefund);
+        _curr_check_btn = ui->newmainbtn_needrefund;
     }
 
 }
@@ -1063,14 +1119,14 @@ void NewMainForm::on_newmainbtn_down_clicked()
 
     int page =  _curr_page_num/(num - 1) ;
 
-    if(ui->newmaintablewidget_order->rowCount()%(num - 1) != 0)
+    if(_curr_page_num%(num - 1) != 0)
         ++ page;
 
     if(_curr_page < page)
     {  
-        if(_curr_page == page - 1 && ui->newmaintablewidget_order->rowCount()%(num - 1) != 0)
+        if(_curr_page == page - 1 && _curr_page_num%(num - 1) != 0)
         {
-            ui->newmaintablewidget_order->viewport()->setFixedHeight(ui->newmaintablewidget_order->rowCount()%(num - 1) * 36);
+            ui->newmaintablewidget_order->viewport()->setFixedHeight(_curr_page_num%(num - 1) * 36);
         }
         ui->newmaintablewidget_order->verticalScrollBar()->setValue(_curr_page*(num - 1));
         ++ _curr_page;
@@ -1084,7 +1140,7 @@ void NewMainForm::on_newmainbtn_up_clicked()
 
     int page =  _curr_page_num/(num - 1) ;
 
-    if(ui->newmaintablewidget_order->rowCount()%(num - 1) != 0)
+    if(_curr_page_num%(num - 1) != 0)
         ++ page;
 
     if(_curr_page > 1)
@@ -1100,3 +1156,29 @@ void NewMainForm::on_newmainbtn_close_clicked()
 {
     FMApplication::exit(0);
 }
+
+void NewMainForm::on_newmainbtn_jump_clicked()
+{
+    int num = ui->newmaintablewidget_order->height()/36;
+    int page = ui->newmainline_page->text().toInt();
+
+    int tmppage =  _curr_page_num/(num - 1) ;
+
+    if(_curr_page_num%(num - 1) != 0)
+        ++ tmppage;
+
+    if(page > 0 && page <= tmppage && page != _curr_page)
+    {
+        if(page == tmppage && _curr_page_num%(num - 1) != 0)
+        {
+            ui->newmaintablewidget_order->viewport()->setFixedHeight(_curr_page_num%(num - 1) * 36);
+        }
+        else
+        {
+            ui->newmaintablewidget_order->viewport()->setFixedHeight((num - 1) * 36);
+        }
+        _curr_page = page;
+        ui->newmaintablewidget_order->verticalScrollBar()->setValue((_curr_page-1)*(num - 1));
+        ui->newmainlabel_page->setText(QString::number(_curr_page)+ "/" + QString::number(tmppage));
+    }
+}

takeout/view/newmainform.h

@@ -79,12 +79,15 @@ private slots:
     void on_newmaincombx_name_currentIndexChanged(int index);
 
     void on_newmainvtn_ordersave_clicked();
+
     void on_newmainbtn_down_clicked();
 
     void on_newmainbtn_up_clicked();
 
     void on_newmainbtn_close_clicked();
 
+    void on_newmainbtn_jump_clicked();
+
 private:
     Ui::NewMainForm *ui;
     //
@@ -120,6 +123,7 @@ private:
     void InitClassify();
     void SetChecked(QPushButton *btn);
     void UpdateTableWidget(OrderObject &orderObject);
+    void DeleteTableWidget(QString orderid);
     //初始化设置界面
     void InitSettingWidget(QString type);
     //初始化订单界面
@@ -145,6 +149,7 @@ private:
     void InitPageNum();
     void InitMainBtn();
     void SetMainBtnCheck(MainBtn *wgt);
+    void ClassifyOrderWithOrderType();
 };
 
 class NewMainFormDataProcess

takeout/view/newmainform.ui

@@ -85,13 +85,8 @@ QTabWidget#newmaintbwgt QTabBar::tab
 
 #newmainlabel_title
 {
-	width:103px;
-	height:24px;
-	font-size:24px;
-	font-family:PingFangSC-Regular;
-	font-weight:400;
+	font-size:20px;
 	color:rgb(255,255,255);
-	line-height:70px;
 	font: 75 24px "微软雅黑";
 }
 #newmainlabel_storename,#newmainlabel_store,#newmainlabel_posid,#newmainlabel_posno,#newmainlabel_netstatus,#newmainlabel_time
@@ -215,7 +210,11 @@ QTabWidget#newmaintbwgt QTabBar::tab
 {
 	height: 0px;
 }
-</string>
+#newmainlabel_mgtitile
+{
+	font: 75 24px &quot;微软雅黑&quot;;
+	color:rgba(51,51,51,1);
+}</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7">
    <property name="spacing">
@@ -237,13 +236,13 @@ QTabWidget#newmaintbwgt QTabBar::tab
     <widget class="QWidget" name="newmainwgt_left" native="true">
      <property name="minimumSize">
       <size>
-       <width>240</width>
+       <width>160</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>240</width>
+       <width>160</width>
        <height>16777215</height>
       </size>
      </property>
@@ -294,7 +293,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>36</width>
+            <width>14</width>
             <height>20</height>
            </size>
           </property>
@@ -304,14 +303,14 @@ QTabWidget#newmaintbwgt QTabBar::tab
          <widget class="QLabel" name="newmainlabel_logo">
           <property name="minimumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>20</width>
+            <height>20</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>20</width>
+            <height>20</height>
            </size>
           </property>
           <property name="styleSheet">
@@ -332,7 +331,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>21</width>
+            <width>12</width>
             <height>20</height>
            </size>
           </property>
@@ -397,7 +396,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>36</width>
+            <width>16</width>
             <height>36</height>
            </size>
           </property>
@@ -406,27 +405,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
         <item>
          <widget class="QLabel" name="newmainlabel_store">
           <property name="text">
-           <string>门店:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>17</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="newmainlabel_storename">
-          <property name="text">
-           <string>非码测试</string>
+           <string>门店:0001</string>
           </property>
          </widget>
         </item>
@@ -476,7 +455,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>36</width>
+            <width>16</width>
             <height>20</height>
            </size>
           </property>
@@ -485,27 +464,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
         <item>
          <widget class="QLabel" name="newmainlabel_posid">
           <property name="text">
-           <string>POS编号:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_7">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>17</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="newmainlabel_posno">
-          <property name="text">
-           <string>001</string>
+           <string>收银:0001</string>
           </property>
          </widget>
         </item>
@@ -555,7 +514,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>36</width>
+            <width>16</width>
             <height>20</height>
            </size>
           </property>
@@ -614,7 +573,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>36</width>
+            <width>16</width>
             <height>20</height>
            </size>
           </property>
@@ -705,7 +664,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
           <height>30</height>
          </size>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="23,2,1">
+        <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0,23,2,1">
          <property name="spacing">
           <number>0</number>
          </property>
@@ -722,6 +681,29 @@ QTabWidget#newmaintbwgt QTabBar::tab
           <number>0</number>
          </property>
          <item>
+          <spacer name="horizontalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>17</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="newmainlabel_mgtitile">
+           <property name="text">
+            <string>订单管理</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <spacer name="horizontalSpacer_12">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -2845,7 +2827,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
          </item>
          <item>
           <widget class="QWidget" name="newmainwgt_order" native="true">
-           <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,4">
+           <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,0,4">
             <property name="spacing">
              <number>0</number>
             </property>
@@ -2862,6 +2844,22 @@ QTabWidget#newmaintbwgt QTabBar::tab
              <number>0</number>
             </property>
             <item>
+             <spacer name="verticalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>36</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
              <widget class="QWidget" name="newmainwgt_check" native="true">
               <layout class="QVBoxLayout" name="verticalLayout_2">
                <property name="spacing">
@@ -3011,7 +3009,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
-                   <height>40</height>
+                   <height>36</height>
                   </size>
                  </property>
                 </spacer>
@@ -3021,6 +3019,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
                  <property name="spacing">
                   <number>0</number>
                  </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
                  <item>
                   <spacer name="horizontalSpacer_76">
                    <property name="orientation">
@@ -3031,30 +3032,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>12</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QLabel" name="newmainlabel_8">
-                   <property name="text">
-                    <string>订单状态:</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="horizontalSpacer_58">
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeType">
-                    <enum>QSizePolicy::Fixed</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>12</width>
+                     <width>10</width>
                      <height>20</height>
                     </size>
                    </property>
@@ -3181,13 +3159,13 @@ QTabWidget#newmaintbwgt QTabBar::tab
                   </widget>
                  </item>
                  <item>
-                  <spacer name="horizontalSpacer_25">
+                  <spacer name="horizontalSpacer_7">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>17</width>
+                     <width>40</width>
                      <height>20</height>
                     </size>
                    </property>
@@ -3285,11 +3263,6 @@ QTabWidget#newmaintbwgt QTabBar::tab
                      </column>
                      <column>
                       <property name="text">
-                       <string>订单号</string>
-                      </property>
-                     </column>
-                     <column>
-                      <property name="text">
                        <string>金额</string>
                       </property>
                      </column>
@@ -3305,11 +3278,6 @@ QTabWidget#newmaintbwgt QTabBar::tab
                      </column>
                      <column>
                       <property name="text">
-                       <string>下单时间</string>
-                      </property>
-                     </column>
-                     <column>
-                      <property name="text">
                        <string>操作</string>
                       </property>
                      </column>
@@ -3322,7 +3290,7 @@ QTabWidget#newmaintbwgt QTabBar::tab
                    <property name="minimumSize">
                     <size>
                      <width>0</width>
-                     <height>80</height>
+                     <height>74</height>
                     </size>
                    </property>
                    <layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -3460,6 +3428,9 @@ QTabWidget#newmaintbwgt QTabBar::tab
                         <height>30</height>
                        </size>
                       </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
                      </widget>
                     </item>
                     <item>