show

main.cpp

@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     auto log = QLOG::QLogManger::this_()->baseLog();
     log->setOutState(QLOG::File);
         MainWindow w;
-        w.show();
+        w.showMaximized();
     return a.exec();
 }
 

mainwindow.cpp

@@ -19,7 +19,8 @@ MainWindow::MainWindow(QWidget *parent)
     ui->stackedWidget->setCurrentWidget(ui->pageLogin);
     connect(ui->pageAutoPack,&AutoPackForm::djmbbox,this,&MainWindow::changedjmb);
     connect(ui->widgetLogin,&LoginForm::SettingsClicked,this,&MainWindow::changeToSettings);
-
+    connect(ui->actionQuanping,&QAction::trigger,[this](){this->showFullScreen();});
+    connect(ui->actionMax,&QAction::trigger,[this](){this->showMaximized();});
     database.openDB();
     database.createDetailsDatabase();
     database.createProductDatabase();

mainwindow.ui

@@ -356,8 +356,26 @@ color: rgb(255, 255, 255);</string>
      <height>30</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menu">
+    <property name="title">
+     <string>显示</string>
+    </property>
+    <addaction name="actionQuanping"/>
+    <addaction name="actionMax"/>
+   </widget>
+   <addaction name="menu"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
+  <action name="actionQuanping">
+   <property name="text">
+    <string>全屏</string>
+   </property>
+  </action>
+  <action name="actionMax">
+   <property name="text">
+    <string>最大化</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

widget/autopackform.cpp

@@ -136,6 +136,12 @@ void AutoPackForm::on_addBoxList_clicked()
         packinfo->packing_type = _info.category;
         ui->tableWidget->clearContents();
         ui->tableWidget->setRowCount(0);
+        ui->tableWidget->setColumnWidth(0,20);
+        ui->tableWidget->setColumnWidth(1,20);
+        ui->tableWidget->setColumnWidth(2,80);
+        ui->tableWidget->setColumnWidth(3,80);
+        ui->tableWidget->setColumnWidth(4,80);
+        ui->tableWidget->setColumnWidth(5,40);
     }
     auto box = packinfo->addBoxInfo();
     //TODO： 添加箱单 数据
@@ -152,12 +158,11 @@ void AutoPackForm::on_addBoxList_clicked()
     //TODO: 缓存数据，显示数据
     ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,0,new QTableWidgetItem(QString::number(ui->tableWidget->rowCount())));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(box->caseNumber()));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(QString::number(box->tube_number)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem((box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(QString::number(box->bucket_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(QString::number(box->net_weight / 1000.00)));
-
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem((box->gross_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(QString::number(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(QString::number(box->net_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
 
 
 //    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));

widget/autopackform.ui

@@ -407,11 +407,6 @@ color: rgb(0, 170, 255);</string>
          <string>序号</string>
         </property>
        </column>
-       <column>
-        <property name="text">
-         <string>箱号</string>
-        </property>
-       </column>
        <column>
         <property name="text">
          <string>筒数</string>
@@ -432,6 +427,11 @@ color: rgb(0, 170, 255);</string>
          <string>净重</string>
         </property>
        </column>
+       <column>
+        <property name="text">
+         <string>箱号</string>
+        </property>
+       </column>
       </widget>
      </item>
      <item>

widget/fixedweightpackform.cpp

@@ -102,6 +102,12 @@ void FixedWeightPackForm::on_addBoxList_clicked()
         packinfo->packing_type = _info.category;
         ui->tableWidget->clearContents();
         ui->tableWidget->setRowCount(0);
+        ui->tableWidget->setColumnWidth(0,20);
+        ui->tableWidget->setColumnWidth(1,20);
+        ui->tableWidget->setColumnWidth(2,80);
+        ui->tableWidget->setColumnWidth(3,80);
+        ui->tableWidget->setColumnWidth(4,80);
+        ui->tableWidget->setColumnWidth(5,40);
     }
     auto box = packinfo->addBoxInfo();
 
@@ -118,12 +124,12 @@ void FixedWeightPackForm::on_addBoxList_clicked()
 
     ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,0,new QTableWidgetItem(QString::number(ui->tableWidget->rowCount())));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(box->caseNumber()));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(getDecimalbit(box->tube_number / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(getDecimalbit(box->net_weight / 1000.00)));
 
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->net_weight / 1000.00)));
+  ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
 
 //    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));
 //    qDebug()<<packinfo->boxes().size();

widget/fixedweightpackform.ui

@@ -149,11 +149,6 @@
             <string>序号</string>
            </property>
           </column>
-          <column>
-           <property name="text">
-            <string>箱号</string>
-           </property>
-          </column>
           <column>
            <property name="text">
             <string>筒数</string>
@@ -174,6 +169,11 @@
             <string>净重</string>
            </property>
           </column>
+          <column>
+           <property name="text">
+            <string>箱号</string>
+           </property>
+          </column>
          </widget>
         </item>
        </layout>

widget/loginform.cpp

@@ -14,6 +14,13 @@ LoginForm::LoginForm(QWidget *parent) :
     ui->status->setVisible(false);
     this->setEnabled(true);
     ui->linePass->setEchoMode(QLineEdit::Password);
+    CacheFile f;
+    auto dt = f.readFile("userpass.cache");
+    auto list = QString::fromUtf8(dt).split("[,]");
+    if(list.size() == 2){
+        ui->lineUser->setText(list.at(0));
+        ui->linePass->setText(list.at(1));
+    }
 }
 
 LoginForm::~LoginForm()
@@ -36,8 +43,8 @@ void LoginForm::on_pushLogin_clicked()
     auto upass = this->ui->linePass->text();
     auto url = glo->config().baseUrl+"/v1/signin";
     QMap<QString,QString> params;
-    params.insert("password",uname);
-    params.insert("username",upass);
+    params.insert("password",upass);
+    params.insert("username",uname);
     request()->post(url,params);
     ui->status->setVisible(true);
     this->setEnabled(false);
@@ -76,15 +83,18 @@ void LoginForm::result(int code, const QJsonObject & body)
         return;
     }
 
-    if(message == "未找到用户"){
+    QStringList list;
+    list << ui->lineUser->text() <<  ui->linePass->text();
+    CacheFile f;
+    f.writeFile("userpass.cache",list.join("[,]").toUtf8());
+    CacheFile cf;
+    cf.writeFile("userlogin.cache",QJsonDocument(body).toJson());
+    auto data  = body.value("data").toObject();
+    if(data.isEmpty()){
         QMessageBox msg(QMessageBox::Information, "错误", "用户名或密码错误", QMessageBox::Ok, this);
         msg.exec();
         return;
     }
-
-    CacheFile cf;
-    cf.writeFile("userlogin.cache",QJsonDocument(body).toJson());
-    auto data  = body.value("data").toObject();
     UserInfo user;
     user.accountId = data["account_id"].toInt();
     user.userId = data["user_id"].toInt();

widget/uncertainweightpackform.cpp

@@ -116,6 +116,12 @@ void UncertainWeightPackForm::on_addBoxList_clicked()
         packinfo->packing_type = _info.category;
         ui->tableWidget->clearContents();
         ui->tableWidget->setRowCount(0);
+        ui->tableWidget->setColumnWidth(0,20);
+        ui->tableWidget->setColumnWidth(1,20);
+        ui->tableWidget->setColumnWidth(2,80);
+        ui->tableWidget->setColumnWidth(3,80);
+        ui->tableWidget->setColumnWidth(4,80);
+        ui->tableWidget->setColumnWidth(5,40);
     }
     auto box = packinfo->addBoxInfo();
 
@@ -132,13 +138,13 @@ void UncertainWeightPackForm::on_addBoxList_clicked()
 
     ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,0,new QTableWidgetItem(QString::number(ui->tableWidget->rowCount())));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(box->caseNumber()));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(QString::number(box->tube_number)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(getDecimalbit(box->net_weight/1000.00)));
 
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->net_weight/1000.00)));
 
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
 //    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));
 //    qDebug()<<packinfo->boxes().size();
 //    doSend(packinfo);

widget/uncertainweightpackform.ui

@@ -149,11 +149,6 @@
             <string>序号</string>
            </property>
           </column>
-          <column>
-           <property name="text">
-            <string>箱号</string>
-           </property>
-          </column>
           <column>
            <property name="text">
             <string>筒数</string>
@@ -174,6 +169,11 @@
             <string>净重</string>
            </property>
           </column>
+          <column>
+           <property name="text">
+            <string>箱号</string>
+           </property>
+          </column>
          </widget>
         </item>
        </layout>