做了一些修改

2020-11-27 11:32:13 +08:00
parent c5be602bcf
commit 52d85dd319
17 changed files with 356 additions and 89 deletions
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
@@ -50,7 +50,7 @@ void QCarDealerAchievementWidget::onImport()
 	try
 	{
 		ImportCarDealerAchievementToOracleCpp( userName, password, tnsName, achievementVector );
-		
+
 		showCarDealerAchievement();
 	}
 	catch ( runtime_error & error )
@@ -65,80 +65,80 @@ void QCarDealerAchievementWidget::onImport()

 void QCarDealerAchievementWidget::showCarDealerAchievement()
 {
+	QTableWidgetItem * pItem       = nullptr;
+	int                rowIndex    = 0;
+	int                columnIndex = 0;
+
 	ui.pTableWidgetAchievement->clearContents();
-
-	QTableWidgetItem * pItem = nullptr;
-	int rowIndex = 0;
-	int columnIndex = 0;
-
-	ui.pTableWidgetAchievement->setRowCount(achievementVector.size());
+	ui.pTableWidgetAchievement->setRowCount( achievementVector.size() );
+	ui.pTableWidgetAchievement->horizontalHeader()->setHighlightSections( false );

 	for ( auto iter = achievementVector.begin();
 	      iter != achievementVector.end();
 	      ++iter, ++rowIndex )
 	{
 		//年度
-		pItem = new QTableWidgetItem(QString::fromStdWString(iter->getTheYear()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::fromStdWString( iter->getTheYear() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//月份
-		pItem = new QTableWidgetItem(QString::fromStdWString(iter->getTheMonth()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::fromStdWString( iter->getTheMonth() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//车商代码
-		pItem = new QTableWidgetItem(QString::fromStdWString(iter->getCarDealerCode()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::fromStdWString( iter->getCarDealerCode() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//车商名称
-		pItem = new QTableWidgetItem(QString::fromStdWString(iter->getCarDealerCode()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::fromStdWString( iter->getCarDealerCode() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//店内双签产值
-		pItem = new QTableWidgetItem(QString::number(iter->getCheckedAchievement(), 'g', -1));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getCheckedAchievement(), 'g', -1 ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//店内新车开票数
-		pItem = new QTableWidgetItem(QString::number(iter->getPolicyAmount(),10));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getPolicyAmount(), 10 ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//我司新车签单台次
-		pItem = new QTableWidgetItem(QString::number(iter->getCpicAmount()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getCpicAmount() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//人保新车签单台次
-		pItem = new QTableWidgetItem(QString::number(iter->getPiccAmount()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getPiccAmount() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//平安新车签单台次
-		pItem = new QTableWidgetItem(QString::number(iter->getPinganAmount()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getPinganAmount() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );

 		//其他保险公司
-		pItem = new QTableWidgetItem(QString::number(iter->getOthersAmount()));
-		pItem->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+		pItem = new QTableWidgetItem( QString::number( iter->getOthersAmount() ) );
+		pItem->setTextAlignment( Qt::AlignVCenter | Qt::AlignHCenter );

-		ui.pTableWidgetAchievement->setItem(rowIndex, columnIndex++, pItem);
+		ui.pTableWidgetAchievement->setItem( rowIndex, columnIndex++, pItem );
 	}

-	resizeTableWidgetTab(ui.pTableWidgetAchievement, 10);
+	resizeTableWidgetTab( ui.pTableWidgetAchievement, 10 );
 }

 void QCarDealerAchievementWidget::init()
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.ui
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.ui
@@ -72,6 +72,21 @@
    </item>
    <item>
     <widget class="QTableWidget" name="pTableWidgetAchievement">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
      <column>
       <property name="text">
        <string>年度</string>
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/QCarDealerSchemaWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/QCarDealerSchemaWidget.cpp
@@ -86,6 +86,7 @@ void QCarDealerSchemaWidget::showCarDealerSchema()
 {
 	ui.pTableWidgetSchema->clearContents();
 	ui.pTableWidgetSchema->setRowCount( schemeVector.size() );
+	ui.pTableWidgetSchema->horizontalHeader()->setHighlightSections(false);

 	int                rowIndex    = 0;
 	int                columnIndex = 0;
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/QCarDealerSchemaWidget.ui
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/QCarDealerSchemaWidget.ui
@@ -72,6 +72,24 @@
    </item>
    <item>
     <widget class="QTableWidget" name="pTableWidgetSchema">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="showDropIndicator" stdset="0">
+       <bool>false</bool>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
      <column>
       <property name="text">
        <string>年度</string>
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.cpp
@@ -1,11 +1,60 @@
+#include <QtWidgets/QtWidgets>
 #include "QRepairRecommendationWidget.h"

-QRepairRecommendationWidget::QRepairRecommendationWidget(QWidget *parent)
-	: QWidget(parent)
+QRepairRecommendationWidget::QRepairRecommendationWidget( QWidget * parent )
+	: QWidget( parent )
 {
-	ui.setupUi(this);
+	ui.setupUi( this );
 }

 QRepairRecommendationWidget::~QRepairRecommendationWidget()
 {
 }
+
+void QRepairRecommendationWidget::onImport()
+{
+	//打开文件
+	QString dir    = QString::fromLocal8Bit( "." );
+	QString filter = QString::fromLocal8Bit( "Excel文件（*.xlsx)" );
+
+	QStringList fileList = QFileDialog::getOpenFileNames( this,
+	                                                      QString::fromLocal8Bit( "请选择要导入的数据文件" ),
+	                                                      dir,
+	                                                      filter );
+
+	//清理旧数据
+	recommandationVector.clear();
+
+	//遍历文件列表，导入每一个文件
+	for ( auto iterFile = fileList.begin();
+		  iterFile != fileList.end();
+		  ++iterFile )
+	{
+		
+	}
+}
+
+void QRepairRecommendationWidget::init()
+{
+	initData();
+	initWidgets();
+	initSignal();
+}
+
+void QRepairRecommendationWidget::initData()
+{
+}
+
+void QRepairRecommendationWidget::initWidgets()
+{
+	setLayout( ui.pLayoutMain );
+}
+
+void QRepairRecommendationWidget::initSignal()
+{
+	connect( ui.pButtonImport, SIGNAL( clicked() ), this, SLOT( onImport() ) );
+}
+
+void QRepairRecommendationWidget::showRepairRecommandation()
+{
+}
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.h
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.h
@@ -1,7 +1,9 @@
-#pragma once
+#pragma once

 #include <QWidget>
+#include <vector>
 #include "ui_QRepairRecommendationWidget.h"
+#include "../../Data/Datastructure/RepairSuggestion/RepairRecommandationRecord.h"

 class QRepairRecommendationWidget : public QWidget
 {
@@ -11,6 +13,19 @@ public:
 	QRepairRecommendationWidget(QWidget *parent = Q_NULLPTR);
 	~QRepairRecommendationWidget();

+protected Q_SLOTS:
+	void onImport();
+	
+private:
+	void init();
+	void initData();
+	void initWidgets();
+	void initSignal();
+
+	void showRepairRecommandation();
 private:
 	Ui::QRepairRecommendationWidget ui;
+
+	//数据
+	std::vector<RepairRecommandationRecord> recommandationVector;
 };
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.ui
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QRepairRecommendationWidget/QRepairRecommendationWidget.ui
@@ -1,23 +1,189 @@
-<UI version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
 <class>QRepairRecommendationWidget</class>
- <widget class="QWidget" name="QRepairRecommendationWidget" >
-  <property name="objectName" >
-   <string notr="true">QRepairRecommendationWidget</string>
-  </property>
-  <property name="geometry" >
+ <widget class="QWidget" name="QRepairRecommendationWidget">
+  <property name="geometry">
   <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>400</width>
-	<height>300</height>
+    <x>0</x>
+    <y>0</y>
+    <width>774</width>
+    <height>514</height>
   </rect>
  </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
   <string>QRepairRecommendationWidget</string>
  </property>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>150</x>
+     <y>70</y>
+     <width>258</width>
+     <height>240</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="pLayoutMain">
+    <property name="leftMargin">
+     <number>5</number>
+    </property>
+    <property name="topMargin">
+     <number>5</number>
+    </property>
+    <property name="rightMargin">
+     <number>5</number>
+    </property>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QToolButton" name="pButtonImport">
+        <property name="text">
+         <string>导入</string>
+        </property>
+        <property name="icon">
+         <iconset>
+          <normalon>:/QMainFrame/Resources/excel.png</normalon>
+         </iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QTableWidget" name="pTableWidgetRepairRecommandation">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="showDropIndicator" stdset="0">
+       <bool>false</bool>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
+      <column>
+       <property name="text">
+        <string>工单号</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>工单类型</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>报案号</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>推荐车商代码</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>推荐车商名称</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>出险日期</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>车牌号</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>品牌名称</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>短信类型</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>发送时间</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>数据来源</string>
+       </property>
+       <property name="textAlignment">
+        <set>AlignCenter</set>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
 </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="6" margin="11"/>
 <resources/>
 <connections/>
-</UI>
+</ui>
--- a/code/cpp/car_dealer_util/source/Widgets/MainFrame/QMainFrame.ui
+++ b/code/cpp/car_dealer_util/source/Widgets/MainFrame/QMainFrame.ui
@@ -11,7 +11,7 @@
   </rect>
  </property>
  <property name="windowTitle">
-   <string>QMainFrame</string>
+   <string>起个啥名呢？</string>
  </property>
  <widget class="QWidget" name="centralWidget"/>
  <widget class="QMenuBar" name="menuBar">