diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index ff8a320..1b70cb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -9,7 +9,7 @@ #include "databaseconnection.h" #include "id\IdWorker.h" -#include "QStringList" + //部门任务 @@ -52,7 +52,6 @@ QDateTime require_over_time; QString deliverer; QString is_urgent; - }; //创建任务单-查看任务单 class CatTask @@ -242,15 +241,9 @@ QString belong_standard_equipment; }; -class BaseEntity: public QObject -{ - Q_OBJECT - public: - -}; //被检设备管理-检定项目及检定点-检定项多功能校准源 -class VerMultiCal:public BaseEntity +class VerMultiCal { public: QString id; @@ -372,7 +365,6 @@ class Technique_File { public: - QString id; QString file_distribute_no; QString file_name; QString version_no; @@ -452,22 +444,12 @@ public: BaseCommonApi(); - // - static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); - //部门任务 - static QList getAllData(); - //部门任务 参数登录用户的id static QList getAllData(QString userId); - //我的任务 static QList getMyTasks(QString id); //获取创建任务首页数据 - - static QListgetCreateTaskList(QString userId); - - - + static QListgetCreateTaskList(QString id); //创建任务-查看任务单顶部 static QListgetCatTask(QString orderNo); //创建任务-查看任务列表底部 @@ -497,10 +479,7 @@ //判断 哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 - - - static QList getVerMultiCal(QString itemId,QStringList *headList); - + static QList getVerMultiCal(QString itemId,QStringList *headList); // 获取检定数据管理 首页 static QList getVerificationData(); // 检定数据管理-检定基本信息 @@ -515,7 +494,6 @@ static QList getCheckDataManageResultManageMult(QString equipment_id); //技术文件 static QList getTechnique_File(); - //检定程序管理首页查询 static QList getVerificationProgramInfoMain(); //检定程序管理 编辑 @@ -547,6 +525,7 @@ IdWorker &idWorker = Singleton::instance(); //自动检定 + }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index ff8a320..1b70cb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -9,7 +9,7 @@ #include "databaseconnection.h" #include "id\IdWorker.h" -#include "QStringList" + //部门任务 @@ -52,7 +52,6 @@ QDateTime require_over_time; QString deliverer; QString is_urgent; - }; //创建任务单-查看任务单 class CatTask @@ -242,15 +241,9 @@ QString belong_standard_equipment; }; -class BaseEntity: public QObject -{ - Q_OBJECT - public: - -}; //被检设备管理-检定项目及检定点-检定项多功能校准源 -class VerMultiCal:public BaseEntity +class VerMultiCal { public: QString id; @@ -372,7 +365,6 @@ class Technique_File { public: - QString id; QString file_distribute_no; QString file_name; QString version_no; @@ -452,22 +444,12 @@ public: BaseCommonApi(); - // - static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); - //部门任务 - static QList getAllData(); - //部门任务 参数登录用户的id static QList getAllData(QString userId); - //我的任务 static QList getMyTasks(QString id); //获取创建任务首页数据 - - static QListgetCreateTaskList(QString userId); - - - + static QListgetCreateTaskList(QString id); //创建任务-查看任务单顶部 static QListgetCatTask(QString orderNo); //创建任务-查看任务列表底部 @@ -497,10 +479,7 @@ //判断 哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 - - - static QList getVerMultiCal(QString itemId,QStringList *headList); - + static QList getVerMultiCal(QString itemId,QStringList *headList); // 获取检定数据管理 首页 static QList getVerificationData(); // 检定数据管理-检定基本信息 @@ -515,7 +494,6 @@ static QList getCheckDataManageResultManageMult(QString equipment_id); //技术文件 static QList getTechnique_File(); - //检定程序管理首页查询 static QList getVerificationProgramInfoMain(); //检定程序管理 编辑 @@ -547,6 +525,7 @@ IdWorker &idWorker = Singleton::instance(); //自动检定 + }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index ddd78ef..9b49a1a 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -2,15 +2,12 @@ #include "ui_create_task.h" #include "QMessageBox" - - QString Create_Task::State=""; Create_Task::Create_Task(QWidget *parent) : InfoBase(parent), ui(new Ui::Create_Task) { ui->setupUi(this); this->initForm(); - } Create_Task::~Create_Task() @@ -28,19 +25,17 @@ "background-color:white;" "}"); - //ui->tableWidget->setRowCount(10); // 设置10行 - ui->tableWidget->setColumnCount(9); // 设置11列 + ui->tableWidget->setRowCount(10); // 设置10行 + ui->tableWidget->setColumnCount(8); // 设置11列 ui->tableWidget->setColumnWidth(0, 80); // 设置第一列的宽度为100像素 ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 - //QTableWidgetItem *item = new QTableWidgetItem("测试数据"); - //item->setTextAlignment(Qt::AlignCenter); - //ui->tableWidget->setItem(0, 0, item); //设置数据 - ui->tableWidget->setColumnWidth(0, 0); // 设置第一列的宽度为0 + QTableWidgetItem *item = new QTableWidgetItem("测试数据"); + item->setTextAlignment(Qt::AlignCenter); + ui->tableWidget->setItem(0, 0, item); //设置数据 //初始化TableWidget 设置列 QStringList headers; - headers <<"ID"<< "序号" << "任务单编号" << "委托方"<< "使用部门" - << "要求检完时间" << "送检人"<<"是否加急"<<"操作"; + headers << "序号" << "任务单编号" << "委托方"<< "使用部门" << "要求检完时间" << "送检人"<<"是否加急"<<"操作"; ui->tableWidget->setHorizontalHeaderLabels(headers); //ShowMessageBox("标题","初始化完成"); } @@ -62,171 +57,5 @@ } void Create_Task::Load() { - //先设置为行为0 - ui->tableWidget->setRowCount(0); - ui->stackedWidget->setCurrentIndex(0); - - QList data = BaseCommonApi::getCreateTaskList(""); - - int rowCount = 0; - int row=0; - QString is_urgent; - for (const CreateTaskList& item : data) { - rowCount = ui->tableWidget->rowCount(); - - ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(item.id)); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(item.order_no)); - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(item.customer_name)); - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(item.DEPT_FULL_NAME)); - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(item.require_over_time.toString())); - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(item.deliverer)); - if(item.is_urgent=="1") - is_urgent="是"; - else - is_urgent="否"; - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(is_urgent)); - - //实现单元格添加两个按钮 - // 创建一个QWidget作为单元格的容器 - QWidget *widget = new QWidget(); - QHBoxLayout *layout = new QHBoxLayout(widget); // 水平布局 - - - QPushButton *button = new QPushButton("查看"); - QPushButton *button2 = new QPushButton("编辑"); - QPushButton *button3 = new QPushButton("删除"); - - //设置按钮1简单样式 - button->setStyleSheet("QPushButton {" - " border: none; /* 无边框 */" - " color: green; /* 文本颜色 */" - " text-decoration: underline; /* 文本下划线 */" - "}"); - - // 设置鼠标悬停时的光标样式为小手图标 - button->setCursor(Qt::PointingHandCursor); - // 连接按钮的 clicked 信号到自定义槽函数 - connect(button, &QPushButton::clicked, this, [this, button, row]() { - // 获取当前行第一列的 ID - QTableWidgetItem *idItem = this->ui->tableWidget->item(row, 0); - if (idItem) { - QString id = idItem->text(); - OnButtonSelectClicked(id); - Create_Task::State="Select"; - } - - }); - //设置按钮2简单样式 - button2->setStyleSheet("QPushButton {" - " border: none; /* 无边框 */" - " color: green; /* 文本颜色 */" - " text-decoration: underline; /* 文本下划线 */" - "}"); - - // 设置鼠标悬停时的光标样式为小手图标 - button2->setCursor(Qt::PointingHandCursor); - // 连接按钮的 clicked 信号到自定义槽函数 - connect(button2, &QPushButton::clicked, this, [this, button2, row]() { - // 获取当前行第一列的 ID - QTableWidgetItem *idItem = this->ui->tableWidget->item(row, 0); - if (idItem) { - QString id = idItem->text(); - OnButtonUpdateClicked(id); - Create_Task::State="Update"; - } - - }); - //设置按钮3简单样式 - button3->setStyleSheet("QPushButton {" - " border: none; /* 无边框 */" - " color: red; /* 文本颜色 */" - " text-decoration: underline; /* 文本下划线 */" - "}"); - - // 设置鼠标悬停时的光标样式为小手图标 - button3->setCursor(Qt::PointingHandCursor); - // 连接按钮的 clicked 信号到自定义槽函数 - connect(button3, &QPushButton::clicked, this, [this, button3, row]() { - // 获取当前行第一列的 ID - QTableWidgetItem *idItem = this->ui->tableWidget->item(row, 0); - if (idItem) { - QString id = idItem->text(); - OnButtoDeleteClicked(id); - } - - }); - //将按钮添加到布局控件 - layout->addWidget(button); - layout->addWidget(button2); - layout->addWidget(button3); - layout->setContentsMargins(5, 5, 0, 0); // 设置布局边距为0 - widget->setLayout(layout); - //将布局控件添加到 单元格 - ui->tableWidget->setCellWidget(row, 8, widget); - // 调整表格大小以适应内容 - //ui->tableWidget->resizeColumnsToContents(); - // ui->tableWidget->resizeRowsToContents(); - row++; - } -} -void Create_Task::OnButtonSelectClicked(QString id) -{ - // ======================================================================================== - // 查看按钮 点击事件 进入详情页面 - // ==================================================================================== - //DeviceInfoInit(id); - HiddenButton(); - ui->stackedWidget->setCurrentIndex(1); - QMessageBox::information(this, "查看按钮ID",id); -} -void Create_Task::OnButtonUpdateClicked(QString id) -{ - // ======================================================================================== - // 编辑按钮 点击事件 进入详情页面 - // ==================================================================================== - //DeviceInfoInit(id); - DisplayButton(); - ui->stackedWidget->setCurrentIndex(1); - QMessageBox::information(this, "编辑按钮ID",id); -} -void Create_Task::OnButtoDeleteClicked(QString id) -{ - // ======================================================================================== - // 删除按钮 点击事件 进入详情页面 - // ==================================================================================== - //DeviceInfoInit(id); - //ui->stackedWidget->setCurrentIndex(1); - - QMessageBox::information(this, "删除按钮ID",id); -} - -void Create_Task::on_pushButton_2_clicked() -{ - // ======================================================================================== - // 创建任务单按钮 - // ==================================================================================== - DisplayButton(); - ui->stackedWidget->setCurrentIndex(1); - Create_Task::State="Create"; -} -void Create_Task::HiddenButton() -{ - ui->SaveButton->hide(); - ui->CreateButton->hide(); - ui->ScanButton->hide(); - ui->deletebutton->hide(); -} -void Create_Task::DisplayButton() -{ - ui->SaveButton->show(); - ui->CreateButton->show(); - ui->ScanButton->show(); - ui->deletebutton->show(); -} - -void Create_Task::on_pushButton_clicked() -{ - ui->stackedWidget->setCurrentIndex(0); + //ShowMessageBox("创建任务界面","创建任务界面初始化完成"); }