diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
index 8649c54..cab3608 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
@@ -34,6 +34,7 @@
+
@@ -74,6 +75,8 @@
+
+
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
index 561c2c9..e038007 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj.filters
@@ -113,6 +113,12 @@
{10df9eca-f59f-4326-aa5c-d925cd47da8d}
+
+ {3510187f-abab-4e08-b5b5-0c094c4f4952}
+
+
+ {1145dd3a-e5a2-4742-8581-94299ac233c6}
+
@@ -187,6 +193,9 @@
窗口\内容窗口\数据管理\卢霖城 - 送返修推荐表
+
+ 工具\qt相关
+
@@ -298,5 +307,11 @@
数据\数据结构\新送返修监控报表
+
+ 工具\qt相关
+
+
+ Header Files
+
\ No newline at end of file
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/moc_QRepairRecommendationWidget.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/moc_QRepairRecommendationWidget.cpp
new file mode 100644
index 0000000..46ed860
--- /dev/null
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/moc_QRepairRecommendationWidget.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'QRepairRecommendationWidget.h'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include
+#include "D:/develop/projects_win/2019/car_dealer_util/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.h"
+#include
+#include
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'QRepairRecommendationWidget.h' doesn't include ."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.14.2. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+struct qt_meta_stringdata_QRepairRecommendationWidget_t {
+ QByteArrayData data[1];
+ char stringdata0[28];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+ qptrdiff(offsetof(qt_meta_stringdata_QRepairRecommendationWidget_t, stringdata0) + ofs \
+ - idx * sizeof(QByteArrayData)) \
+ )
+static const qt_meta_stringdata_QRepairRecommendationWidget_t qt_meta_stringdata_QRepairRecommendationWidget = {
+ {
+QT_MOC_LITERAL(0, 0, 27) // "QRepairRecommendationWidget"
+
+ },
+ "QRepairRecommendationWidget"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_QRepairRecommendationWidget[] = {
+
+ // content:
+ 8, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 0, 0, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+ 0, 0, // constructors
+ 0, // flags
+ 0, // signalCount
+
+ 0 // eod
+};
+
+void QRepairRecommendationWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+ Q_UNUSED(_o);
+ Q_UNUSED(_id);
+ Q_UNUSED(_c);
+ Q_UNUSED(_a);
+}
+
+QT_INIT_METAOBJECT const QMetaObject QRepairRecommendationWidget::staticMetaObject = { {
+ QMetaObject::SuperData::link(),
+ qt_meta_stringdata_QRepairRecommendationWidget.data,
+ qt_meta_data_QRepairRecommendationWidget,
+ qt_static_metacall,
+ nullptr,
+ nullptr
+} };
+
+
+const QMetaObject *QRepairRecommendationWidget::metaObject() const
+{
+ return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *QRepairRecommendationWidget::qt_metacast(const char *_clname)
+{
+ if (!_clname) return nullptr;
+ if (!strcmp(_clname, qt_meta_stringdata_QRepairRecommendationWidget.stringdata0))
+ return static_cast(this);
+ return QWidget::qt_metacast(_clname);
+}
+
+int QRepairRecommendationWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QWidget::qt_metacall(_c, _id, _a);
+ return _id;
+}
+QT_WARNING_POP
+QT_END_MOC_NAMESPACE
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
index 30f4b24..122e9e2 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
@@ -81,6 +81,9 @@ void QCarDealerAchievementWidget::initData()
void QCarDealerAchievementWidget::initWidgets()
{
setLayout( ui.pLayoutMain );
+
+ ui.pTableWidgetAchievement->resizeColumnsToContents();
+
}
void QCarDealerAchievementWidget::initSignal()
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.cpp b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.cpp
index 5008d9d..eb8e821 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.cpp
@@ -44,7 +44,7 @@ void QDataManagementWidget::initWidgets()
pLayout->addWidget( &achievementWidget );
pLayoutScrollArea->addWidget( pScrollArea );
pScrollArea->setLayout( pLayout );
- ui.carDealerAchievementTab->setLayout( pLayoutScrollArea );
+ ui.pCarDealerAchievementTab->setLayout( pLayoutScrollArea );
//车商方案表
pScrollArea = new QScrollArea(nullptr);
@@ -57,10 +57,46 @@ void QDataManagementWidget::initWidgets()
pLayout->addWidget(&schemaWidget);
pLayoutScrollArea->addWidget(pScrollArea);
pScrollArea->setLayout(pLayout);
- ui.carDealerSchemaTab->setLayout(pLayoutScrollArea);
+ ui.pCarDealerSchemaTab->setLayout(pLayoutScrollArea);
- //送返修推荐表
-
+ //卢霖城送返修推荐表
+ pScrollArea = new QScrollArea(nullptr);
+ pLayoutScrollArea = new QGridLayout();
+ pLayout = new QGridLayout();
+
+ pLayoutScrollArea->setMargin(0);
+ pLayout->setMargin(0);
+
+ pLayout->addWidget(&repairRecommendationWidget);
+ pLayoutScrollArea->addWidget(pScrollArea);
+ pScrollArea->setLayout(pLayout);
+ ui.pRepairRecommandationTab->setLayout(pLayoutScrollArea);
+
+ //新送返修监控
+ pScrollArea = new QScrollArea(nullptr);
+ pLayoutScrollArea = new QGridLayout();
+ pLayout = new QGridLayout();
+
+ pLayoutScrollArea->setMargin(0);
+ pLayout->setMargin(0);
+
+ pLayout->addWidget(&repairRecommendationWidget);
+ pLayoutScrollArea->addWidget(pScrollArea);
+ pScrollArea->setLayout(pLayout);
+ ui.pNewRepairMonitorTab->setLayout(pLayoutScrollArea);
+
+ //送返修工单
+ pScrollArea = new QScrollArea(nullptr);
+ pLayoutScrollArea = new QGridLayout();
+ pLayout = new QGridLayout();
+
+ pLayoutScrollArea->setMargin(0);
+ pLayout->setMargin(0);
+
+ pLayout->addWidget(&repairRecommendationWidget);
+ pLayoutScrollArea->addWidget(pScrollArea);
+ pScrollArea->setLayout(pLayout);
+ ui.pRepairOrderTab->setLayout(pLayoutScrollArea);
}
void QDataManagementWidget::initSignal()
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.h b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.h
index 2e6abaf..e5c34cb 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.h
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.h
@@ -4,13 +4,14 @@
#include "ui_QDataManagementWidget.h"
#include "QCarDealerAchievementWidget.h"
#include "QCarDealerSchemaWidget.h"
+#include "../QRepairRecommendationWidget/QRepairRecommendationWidget.h"
class QDataManagementWidget : public QWidget
{
- Q_OBJECT
+Q_OBJECT
public:
- QDataManagementWidget(QWidget *parent = Q_NULLPTR);
+ QDataManagementWidget( QWidget * parent = Q_NULLPTR );
~QDataManagementWidget();
private:
@@ -18,9 +19,11 @@ private:
void initData();
void initWidgets();
void initSignal();
-
+
private:
- Ui::QDataManagementWidget ui;
+ Ui::QDataManagementWidget ui;
+
QCarDealerAchievementWidget achievementWidget;
- QCarDealerSchemaWidget schemaWidget;
+ QCarDealerSchemaWidget schemaWidget;
+ QRepairRecommendationWidget repairRecommendationWidget;
};
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.ui b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.ui
index 6e84c6f..305a165 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.ui
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/QDataManagementWidget.ui
@@ -48,27 +48,27 @@
1
-
+
车商业绩表
-
+
车商方案表
-
+
送返修工单
-
+
新送返修监控报表
-
+
送返修推荐表
diff --git a/code/cpp/car_dealer_util/source/util/qt/qt_util.cpp b/code/cpp/car_dealer_util/source/util/qt/qt_util.cpp
new file mode 100644
index 0000000..816a398
--- /dev/null
+++ b/code/cpp/car_dealer_util/source/util/qt/qt_util.cpp
@@ -0,0 +1,37 @@
+// **********************************************************
+// 文件名：qt_util.cpp
+// 创建日期：2020-11-16 15:59
+// 作者: 王炜
+// 说明：qt相关的工具函数
+// **********************************************************
+
+#pragma once
+
+#include
+#include "qt_util.h"
+
+using namespace std;
+
+/************************************************
+* \brief 设置TableWidget标题栏的宽度
+* \param pTableWidget
+* \param margin
+************************************************/
+void resizeTableWidgetTab( QTableWidget * pTableWidget, unsigned margin )
+{
+ //验证
+ if ( pTableWidget == nullptr )
+ {
+ throw logic_error( "窗口指针为空！" );
+ }
+
+ int columnCount = pTableWidget->columnCount();
+
+ for ( int columnIndex = 0; columnIndex < columnCount; columnIndex++ )
+ {
+ unsigned int columnWidth = pTableWidget->columnWidth( columnIndex );
+ columnWidth += margin * 2;
+
+ pTableWidget->setColumnWidth( columnIndex, columnWidth );
+ }
+}
diff --git a/code/cpp/car_dealer_util/source/util/qt/qt_util.h b/code/cpp/car_dealer_util/source/util/qt/qt_util.h
new file mode 100644
index 0000000..15b6871
--- /dev/null
+++ b/code/cpp/car_dealer_util/source/util/qt/qt_util.h
@@ -0,0 +1,12 @@
+// **********************************************************
+// 文件名：qt_util.h
+// 创建日期：2020-11-16 15:59
+// 作者: 王炜
+// 说明：qt相关的工具函数
+// **********************************************************
+
+#pragma once
+
+#include
+
+void resizeTableWidgetTab( QTableWidget * pTableWidget, unsigned int margin );