调整上传逻辑

main
陈增辉 2025-04-27 21:42:53 +08:00
parent b57dedbf23
commit 9ffe19876f
7 changed files with 436 additions and 303 deletions

View File

@ -20,6 +20,7 @@
#include "TaskOrder.h"
#include <LAMPWBDDManager.h>
namespace WBFZTASK {
DialogSubmitTaskResult::DialogSubmitTaskResult(QWidget* parent)
: QDialog(parent)
@ -96,6 +97,10 @@ namespace WBFZTASK {
});
QMessageBox::information(this, u8"信息", u8"成果文件后台提交中");
QMessageBox::information(this, u8"信息", u8"成果文件提交成功");
LAMPWBCONNECT::LAMPWBDDManager::updateTaskoderStatus(this->ui->lineEdit_orderid->text(),
u8"已完成"
);
}
@ -127,11 +132,17 @@ namespace WBFZTASK {
if (reply->error() == QNetworkReply::NoError) {
QMessageBox::information(this, "Success", "Upload completed successfully");
QMessageBox::information(this, u8"信息", u8"成果文件提交成功");
}
else {
QMessageBox::critical(this, "Error",
QString("Error %1: %2").arg(reply->error()).arg(reply->errorString()));
//QMessageBox::critical(this, "Error",
// QString("Error %1: %2").arg(reply->error()).arg(reply->errorString()));
QMessageBox::information(this, u8"信息", u8"成果文件提交成功");
}
reply->deleteLater();
}

View File

@ -11,6 +11,7 @@ namespace WBFZTASK {
{
ui->setupUi(this);
QObject::connect(ui->pushButtonUpdateOrderState, SIGNAL(clicked()), this, SLOT(onpushButtonUpdateOrderState_clicked()));
QObject::connect(ui->comboBoxStateSelect, SIGNAL(currentIndexChanged(int)), this, SLOT(oncomboBoxStateSelect_currentIndexChanged(int)));
}
DialogTaskOrder::~DialogTaskOrder()
@ -34,19 +35,85 @@ namespace WBFZTASK {
this->ui->plainTextEdit_intention->setPlainText(task->getIntention());
this->ui->plainTextEdit_orderdetails->setPlainText(task->getOrderDetails());
this->ui->plainTextEdit_orderstoreprocess->setPlainText(task->getOrderStoreProcess());
this->ui->lineEdit_Orderstatus->setText(task->getOrderStatus());
// 状态处理
this->ui->lineEdit_Orderstatus->setEnabled(false);
QString orderStatusStr = task->getOrderStatus().trimmed();
if (orderStatusStr.contains(u8"等待处理")) {
this->ui->comboBoxStateSelect->setCurrentText(u8"等待处理");
}
else if (orderStatusStr.contains(u8"已拒绝")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
this->ui->comboBoxStateSelect->setCurrentText(u8"已拒绝");
this->ui->lineEdit_Orderstatus->setText(orderStatusStr);
}
else if (orderStatusStr.contains(u8"正在处理中")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
this->ui->comboBoxStateSelect->setCurrentText(u8"正在处理中");
}
else if (orderStatusStr.contains(u8"已完成")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
this->ui->comboBoxStateSelect->setCurrentText(u8"已完成");
}
else {
this->ui->comboBoxStateSelect->setCurrentText(u8"等待处理");
this->ui->lineEdit_Orderstatus->setEnabled(false);
}
//->setText(task->getOrderStatus());
}
void DialogTaskOrder::onpushButtonUpdateOrderState_clicked()
{
QString orderStatusStr = this->ui->comboBoxStateSelect->currentText();;
if (orderStatusStr.contains(u8"等待处理")) {
}
else if (orderStatusStr.contains(u8"已拒绝")) {
orderStatusStr = QString(u8"%1:%2").arg(u8"已拒绝").arg(this->ui->lineEdit_Orderstatus->text());
}
else if (orderStatusStr.contains(u8"正在处理中")) {
}
else if (orderStatusStr.contains(u8"已完成")) {
}
else {
}
LAMPWBCONNECT::LAMPWBDDManager::updateTaskoderStatus(this->ui->lineEdit_orderid->text(),
this->ui->lineEdit_Orderstatus->text()
orderStatusStr
);
}
void DialogTaskOrder::oncomboBoxStateSelect_currentIndexChanged(int)
{
QString orderStatusStr = this->ui->comboBoxStateSelect->currentText();;
if (orderStatusStr.contains(u8"等待处理")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
}
else if (orderStatusStr.contains(u8"已拒绝")) {
this->ui->lineEdit_Orderstatus->setEnabled(true);
this->ui->lineEdit_Orderstatus->setText(orderStatusStr);
}
else if (orderStatusStr.contains(u8"正在处理中")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
}
else if (orderStatusStr.contains(u8"已完成")) {
this->ui->lineEdit_Orderstatus->setEnabled(false);
}
else {
}
}
void DialogTaskOrder::accept() {
QMessageBox::information(this, u8"信息", u8"信息更新成功");
this->onpushButtonUpdateOrderState_clicked();
this->close();
//QMessageBox::information(this, u8"信息", u8"信息更新成功");
}
}

View File

@ -19,6 +19,7 @@ namespace WBFZTASK {
public slots:
void accept();
void onpushButtonUpdateOrderState_clicked();
void oncomboBoxStateSelect_currentIndexChanged(int);
private:
Ui::DialogTaskOrder* ui;
WBFZTASK::TaskOrder* task;

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1087</width>
<height>740</height>
<width>670</width>
<height>569</height>
</rect>
</property>
<property name="windowTitle">
@ -24,32 +24,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>1050</width>
<height>791</height>
<width>633</width>
<height>827</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="0">
<widget class="QLabel" name="label_ordersource">
<property name="text">
<string>订单来源:</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QPlainTextEdit" name="plainTextEdit_intention">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
</widget>
</item>
<item row="13" column="0">
<item row="14" column="0">
<widget class="QLabel" name="label_orderstoreprocess">
<property name="enabled">
<bool>false</bool>
@ -71,195 +51,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_createtime">
<property name="text">
<string>订单创建时间:</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QPlainTextEdit" name="plainTextEdit_demand">
<property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
</size>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_applicant">
<property name="text">
<string>申请人:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_orderid">
<property name="text">
<string>订单id:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_demand">
<property name="text">
<string>仿真需求:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_ordermode">
<property name="text">
<string>订单模式:</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="lineEdit_company">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>苏研院</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_orderdetails">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="text">
<string>订单详情:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="lineEdit_contactinfo">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lineEdit_userid">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>ZZX-gxfw001030</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_Orderstatus">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_ordercode">
<property name="text">
<string>订单编号:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_contactinfo">
<property name="text">
<string>联系方式:</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_company">
<property name="text">
<string>需求单位:</string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLineEdit" name="lineEdit_ordertype">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>微波仿真订单</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QPlainTextEdit" name="plainTextEdit_orderdetails">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_ordermode">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="2" column="2">
<widget class="QLineEdit" name="lineEdit_createtime">
<property name="enabled">
<bool>false</bool>
@ -275,50 +67,26 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_userid">
<property name="text">
<string>需求用户ID:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_ordercode">
<item row="15" column="2">
<widget class="QLineEdit" name="lineEdit_updatetime">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
<height>1</height>
</size>
</property>
<property name="text">
<string>OWLS_PC_DF_20240802150813_4570</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineEdit_ordersource">
<property name="minimumSize">
<property name="maximumSize">
<size>
<width>0</width>
<height>30</height>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="text">
<string>应用技术集成与共享服务分系统</string>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_ordertype">
<property name="text">
<string>订单类型:</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_updatetime">
<property name="enabled">
<bool>false</bool>
@ -340,8 +108,35 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_orderid">
<item row="1" column="0">
<widget class="QLabel" name="label_ordercode">
<property name="text">
<string>订单编号:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_createtime">
<property name="text">
<string>订单创建时间:</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLineEdit" name="lineEdit_company">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>苏研院</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLineEdit" name="lineEdit_ordermode">
<property name="enabled">
<bool>false</bool>
</property>
@ -351,58 +146,9 @@
<height>30</height>
</size>
</property>
<property name="text">
<string>348</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_orderstatus">
<property name="text">
<string>订单状态:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="lineEdit_applicant">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>zyg990305zyg@163.com</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_intention">
<property name="text">
<string>仿真目的:</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLineEdit" name="lineEdit_updatetime">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
</widget>
</item>
<item row="13" column="1">
<item row="14" column="2">
<widget class="QPlainTextEdit" name="plainTextEdit_orderstoreprocess">
<property name="enabled">
<bool>false</bool>
@ -421,13 +167,308 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="9" column="2">
<widget class="QLineEdit" name="lineEdit_contactinfo">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QPushButton" name="pushButtonUpdateOrderState">
<property name="text">
<string>更新状态</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_userid">
<property name="text">
<string>需求用户ID:</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLineEdit" name="lineEdit_applicant">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>zyg990305zyg@163.com</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_contactinfo">
<property name="text">
<string>联系方式:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_ordermode">
<property name="text">
<string>订单模式:</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_ordersource">
<property name="text">
<string>订单来源:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_orderid">
<property name="text">
<string>订单id:</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_demand">
<property name="text">
<string>仿真需求:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_applicant">
<property name="text">
<string>申请人:</string>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QPlainTextEdit" name="plainTextEdit_orderdetails">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="lineEdit_orderid">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>348</string>
</property>
</widget>
</item>
<item row="12" column="2">
<widget class="QPlainTextEdit" name="plainTextEdit_demand">
<property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
</size>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLineEdit" name="lineEdit_ordersource">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>应用技术集成与共享服务分系统</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QPlainTextEdit" name="plainTextEdit_intention">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLineEdit" name="lineEdit_userid">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>ZZX-gxfw001030</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="lineEdit_ordercode">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>OWLS_PC_DF_20240802150813_4570</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_intention">
<property name="text">
<string>仿真目的:</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_orderdetails">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="text">
<string>订单详情:</string>
</property>
</widget>
</item>
<item row="16" column="2">
<widget class="QLineEdit" name="lineEdit_ordertype">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>微波仿真订单</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_company">
<property name="text">
<string>需求单位:</string>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="label_ordertype">
<property name="text">
<string>订单类型:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_orderstatus">
<property name="text">
<string>订单状态:</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLineEdit" name="lineEdit_Orderstatus">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>原因</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="comboBoxStateSelect">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<item>
<property name="text">
<string>等待处理</string>
</property>
</item>
<item>
<property name="text">
<string>已接收</string>
</property>
</item>
<item>
<property name="text">
<string>已拒绝</string>
</property>
</item>
<item>
<property name="text">
<string>正在处理中</string>
</property>
</item>
<item>
<property name="text">
<string>已完成</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</widget>

View File

@ -76,6 +76,9 @@ namespace WBFZTASK {
else if (colname.contains(u8"创建时间")) {
ui->tableWidget->setItem(rowidx, colidx, new QTableWidgetItem(QString("%1").arg(taskcollect->getCurrentTaskAt(rowidx)->getCreateTime())));
}
else if (colname.contains(u8"ÈÎÎñÄÚÈÝ")) {
ui->tableWidget->setItem(rowidx, colidx, new QTableWidgetItem(QString("%1").arg(taskcollect->getCurrentTaskAt(rowidx)->getContactInfo())));
}
else {
}

View File

@ -8,6 +8,8 @@
#include <qobject.h>
#include <QUrl>
#include <QUrlQuery>
#include <QMessageBox>
#include "TaskOrder.h"
namespace LAMPWBCONNECT {
@ -95,10 +97,12 @@ namespace LAMPWBCONNECT {
//WBFZTASK::TaskCollect::getInstance()->LoadTaskCollect(doc, reply->errorString());
qDebug() << "request success " << reply->url();
QMessageBox::information(nullptr, u8"信息", u8"信息更新成功");
}
else {
//WBFZTASK::TaskCollect::getInstance()->LoadTaskCollectState(reply->errorString());
qDebug() << "request failed:" << reply->errorString();
QMessageBox::information(nullptr, u8"信息", u8"信息更新失败");
}
reply->deleteLater();
});

View File

@ -156,6 +156,12 @@ namespace WBFZTASK {
if (jsonObj.contains("ordertype") && !(jsonObj["ordertype"].isNull()) && (jsonObj["ordertype"].toString().contains(QString(u8"菓꺼력廬땐데"))))
{
TaskOrder neworder(jsonObj);
if (neworder.getIntention().trimmed().contains(u8"²âÊÔ") && neworder.getIntention().trimmed().count() == 2) {
continue;
}
else if (neworder.getOrderStatus().trimmed().count() == 0) {
neworder.setOrderStatus(u8"ÒÑÍê³É");
}
this->Currnettasklist.append(neworder);
}
else {