From e49e4493a8fd304e8a3825d471d3efe240ffec9c Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Tue, 14 Jul 2020 16:31:57 +0800
Subject: [PATCH] ...

---
 .../QCarDealerAchievementWidget.cpp           |  2 +-
 .../QDataManagementWidget.cpp                 | 20 ++++++++++++++++++-
 .../QDataManagementWidget.h                   |  4 ++++
 .../QDataManagementWidget.ui                  | 13 +++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

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 236d625..fd21ae5 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
@@ -25,7 +25,7 @@ void QCarDealerAchievementWidget::initData()
 
 void QCarDealerAchievementWidget::initWidgets()
 {
-	setLayout(ui.pLayoutMain);
+	setLayout( ui.pLayoutMain );
 }
 
 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 02ad509..4998614 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
@@ -1,4 +1,5 @@
-#include "QDataManagementWidget.h"
+#include <QScrollArea>
+#include "QDataManagementWidget.h"
 
 QDataManagementWidget::QDataManagementWidget( QWidget * parent )
 	: QWidget( parent )
@@ -26,6 +27,23 @@ void QDataManagementWidget::initData()
 void QDataManagementWidget::initWidgets()
 {
 	setLayout( ui.pLayoutMain );
+
+	QScrollArea * pScrollArea       = nullptr;
+	QGridLayout * pLayout           = nullptr;
+	QGridLayout * pLayoutScrollArea = nullptr;
+
+	//车商业绩表
+	pScrollArea       = new QScrollArea( nullptr );
+	pLayoutScrollArea = new QGridLayout;
+	pLayout           = new QGridLayout;
+
+	pLayout->setMargin(0);
+	pLayoutScrollArea->setMargin(0);
+
+	pLayout->addWidget( &achievementWidget );
+	pLayoutScrollArea->addWidget( pScrollArea );
+	pScrollArea->setLayout( pLayout );
+	ui.carDealerAchievementTab->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 7805ef2..2e6abaf 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
@@ -2,6 +2,8 @@
 
 #include <QWidget>
 #include "ui_QDataManagementWidget.h"
+#include "QCarDealerAchievementWidget.h"
+#include "QCarDealerSchemaWidget.h"
 
 class QDataManagementWidget : public QWidget
 {
@@ -19,4 +21,6 @@ private:
 	
 private:
 	Ui::QDataManagementWidget ui;
+	QCarDealerAchievementWidget achievementWidget;
+	QCarDealerSchemaWidget schemaWidget;
 };
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 693a595..8f2a0cf 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
@@ -13,6 +13,17 @@
   <property name="windowTitle">
    <string>QDataManagementWidget</string>
   </property>
+  <property name="styleSheet">
+   <string notr="true">.QScrollArea
+{
+	border: 0px solid silver;
+}
+
+.QTableWidget
+{
+	border:1px solid silver;
+}</string>
+  </property>
   <widget class="QWidget" name="gridLayoutWidget">
    <property name="geometry">
     <rect>
@@ -37,7 +48,7 @@
       <property name="currentIndex">
        <number>0</number>
       </property>
-      <widget class="QWidget" name="tab">
+      <widget class="QWidget" name="carDealerAchievementTab">
        <attribute name="title">
         <string>车商业绩表</string>
        </attribute>