From 191d62844bc548707e8a310af615f594b576ca29 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期二, 23 四月 2024 22:51:06 +0800
Subject: [PATCH] 0423
---
internal_system_v1/clientmainwindow.cpp | 4
internal_system_v1/threemergeproblemlist.cpp | 14 +
internal_system_v1/clientmainwindow.ui | 2
internal_system_v1/internal_system_v1.pro | 9
internal_system_v1/threemergeproblemlist.ui | 459 +++++++++++++++++++++++++++++++++++++++++++++
internal_system_v1/clientmainwindow.h | 4
internal_system_v1/converinfo2.h | 2
internal_system_v1/problemrectstandingbook.ui | 6
internal_system_v1/converinfo2.cpp | 5
internal_system_v1/threemergeproblemlist.h | 22 ++
internal_system_v1/converinfo2.ui | 16 +
11 files changed, 535 insertions(+), 8 deletions(-)
diff --git a/internal_system_v1/clientmainwindow.cpp b/internal_system_v1/clientmainwindow.cpp
index d8897d8..00b85fe 100644
--- a/internal_system_v1/clientmainwindow.cpp
+++ b/internal_system_v1/clientmainwindow.cpp
@@ -124,6 +124,10 @@
ui->tableWidget->setItemDelegateForColumn(1,m_tableItemDelegate);
ui->tableWidget->setItemDelegateForColumn(2,m_tableItemDelegate);
+ // 3鍜�1
+ m_threeMPList = new ThreeMergeProblemList(this);
+ ui->tabWidget->addTab(m_threeMPList,"涓夊悎涓�闂澶勭悊");
+
// 榛樿璋冪敤涓�涓嬩笅鎷夋鐨勮Е鍙戞搷浣�
on_comboBox_currentIndexChanged("浼佷笟(涓嶅惈閲戣瀺浼佷笟)");
diff --git a/internal_system_v1/clientmainwindow.h b/internal_system_v1/clientmainwindow.h
index a6524f6..1331f8b 100644
--- a/internal_system_v1/clientmainwindow.h
+++ b/internal_system_v1/clientmainwindow.h
@@ -21,6 +21,7 @@
#include "problemrectificationresult.h"
#include "tableitemdelegate.h"
#include <QItemDelegate>
+#include "threemergeproblemlist.h"
namespace Ui {
class ClientMainWindow;
@@ -115,6 +116,9 @@
TableItemDelegate *m_tableItemDelegate;
QItemDelegate *m_editDelegate; // 鍙紪杈�
+ // 3鍚堜竴
+ ThreeMergeProblemList *m_threeMPList;
+
};
#endif // CLIENTMAINWINDOW_H
diff --git a/internal_system_v1/clientmainwindow.ui b/internal_system_v1/clientmainwindow.ui
index 6a5dd83..d3da8b2 100644
--- a/internal_system_v1/clientmainwindow.ui
+++ b/internal_system_v1/clientmainwindow.ui
@@ -18,7 +18,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
diff --git a/internal_system_v1/converinfo2.cpp b/internal_system_v1/converinfo2.cpp
index 244da58..977cbe0 100644
--- a/internal_system_v1/converinfo2.cpp
+++ b/internal_system_v1/converinfo2.cpp
@@ -994,3 +994,8 @@
}
}
}
+
+void ConverInfo2::on_pushButton_laodFile_clicked()
+{
+
+}
diff --git a/internal_system_v1/converinfo2.h b/internal_system_v1/converinfo2.h
index 2d53842..96c6384 100644
--- a/internal_system_v1/converinfo2.h
+++ b/internal_system_v1/converinfo2.h
@@ -30,6 +30,8 @@
void on_pushButton_commit_clicked();
+ void on_pushButton_laodFile_clicked();
+
private:
Ui::ConverInfo2 *ui;
QMenu *m_menu;
diff --git a/internal_system_v1/converinfo2.ui b/internal_system_v1/converinfo2.ui
index e9c5184..51e9fc7 100644
--- a/internal_system_v1/converinfo2.ui
+++ b/internal_system_v1/converinfo2.ui
@@ -39,7 +39,7 @@
<property name="geometry">
<rect>
<x>-115</x>
- <y>-637</y>
+ <y>0</y>
<width>1100</width>
<height>1600</height>
</rect>
@@ -3463,6 +3463,19 @@
<string>淇敼鍚庢洿鏂版彁浜�</string>
</property>
</widget>
+ <widget class="QPushButton" name="pushButton_laodFile">
+ <property name="geometry">
+ <rect>
+ <x>860</x>
+ <y>50</y>
+ <width>121</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>鎵嬪姩鍔犺浇</string>
+ </property>
+ </widget>
<zorder>label_70</zorder>
<zorder>label_webSite</zorder>
<zorder>label_townCode</zorder>
@@ -3656,6 +3669,7 @@
<zorder>lineEdit_fillingDateTime</zorder>
<zorder>label_129</zorder>
<zorder>pushButton_commit</zorder>
+ <zorder>pushButton_laodFile</zorder>
</widget>
</widget>
</item>
diff --git a/internal_system_v1/internal_system_v1.pro b/internal_system_v1/internal_system_v1.pro
index 20de903..8c8d5e2 100644
--- a/internal_system_v1/internal_system_v1.pro
+++ b/internal_system_v1/internal_system_v1.pro
@@ -40,7 +40,8 @@
converinfo2.cpp \
problemlist.cpp \
problemrectificationresult.cpp \
- tableitemdelegate.cpp
+ tableitemdelegate.cpp \
+ threemergeproblemlist.cpp
HEADERS += \
clientmainwindow.h \
@@ -59,7 +60,8 @@
struct_data.h \
problemlist.h \
problemrectificationresult.h \
- tableitemdelegate.h
+ tableitemdelegate.h \
+ threemergeproblemlist.h
FORMS += \
clientmainwindow.ui \
@@ -76,7 +78,8 @@
problemrectstandingbook.ui \
converinfo2.ui \
problemlist.ui \
- problemrectificationresult.ui
+ problemrectificationresult.ui \
+ threemergeproblemlist.ui
include(QXlsx/QXlsx.pri)
diff --git a/internal_system_v1/problemrectstandingbook.ui b/internal_system_v1/problemrectstandingbook.ui
index f76ec04..e6a00b8 100644
--- a/internal_system_v1/problemrectstandingbook.ui
+++ b/internal_system_v1/problemrectstandingbook.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1091</width>
- <height>657</height>
+ <width>1097</width>
+ <height>695</height>
</rect>
</property>
<property name="windowTitle">
@@ -583,7 +583,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1091</width>
+ <width>1097</width>
<height>26</height>
</rect>
</property>
diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
new file mode 100644
index 0000000..1a4805c
--- /dev/null
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -0,0 +1,14 @@
+#include "threemergeproblemlist.h"
+#include "ui_threemergeproblemlist.h"
+
+ThreeMergeProblemList::ThreeMergeProblemList(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::ThreeMergeProblemList)
+{
+ ui->setupUi(this);
+}
+
+ThreeMergeProblemList::~ThreeMergeProblemList()
+{
+ delete ui;
+}
diff --git a/internal_system_v1/threemergeproblemlist.h b/internal_system_v1/threemergeproblemlist.h
new file mode 100644
index 0000000..0a3d898
--- /dev/null
+++ b/internal_system_v1/threemergeproblemlist.h
@@ -0,0 +1,22 @@
+#ifndef THREEMERGEPROBLEMLIST_H
+#define THREEMERGEPROBLEMLIST_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class ThreeMergeProblemList;
+}
+
+class ThreeMergeProblemList : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit ThreeMergeProblemList(QWidget *parent = 0);
+ ~ThreeMergeProblemList();
+
+private:
+ Ui::ThreeMergeProblemList *ui;
+};
+
+#endif // THREEMERGEPROBLEMLIST_H
diff --git a/internal_system_v1/threemergeproblemlist.ui b/internal_system_v1/threemergeproblemlist.ui
new file mode 100644
index 0000000..632fa16
--- /dev/null
+++ b/internal_system_v1/threemergeproblemlist.ui
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThreeMergeProblemList</class>
+ <widget class="QMainWindow" name="ThreeMergeProblemList">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1181</width>
+ <height>1019</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>MainWindow</string>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1157</width>
+ <height>944</height>
+ </rect>
+ </property>
+ <widget class="QTableWidget" name="tableWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>70</y>
+ <width>1075</width>
+ <height>142</height>
+ </rect>
+ </property>
+ <column>
+ <property name="text">
+ <string>闂鎻忚堪</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>闂鎻忚堪浣愯瘉璧勬枡</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>闂瀹氭�ф硶瑙勪緷鎹�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>娑夊強閲戦(涓囧厓)</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼閲戦(涓囧厓)</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼鎯呭喌1</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼浣愯瘉璧勬枡1</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼绫诲瀷</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼缁撴灉</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼鏃堕棿</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>灏氭湭鏁存敼鍒颁綅鐨勫師鍥�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>灏氭湭鏁存敼鍒颁綅闂鏁存敼鏈熼檺</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼鎯呭喌2</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼鎯呭喌浣愯瘉璧勬枡2</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼绫诲瀷</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼缁撴灉</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏁存敼鏃堕棿</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>灏氭湭鏁存敼鍒颁綅鐨勫師鍥�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>灏氭湭鏁存敼鍒颁綅闂鏁存敼鏈熼檺</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QTableWidget" name="tableWidget_2">
+ <property name="geometry">
+ <rect>
+ <x>33</x>
+ <y>288</y>
+ <width>989</width>
+ <height>271</height>
+ </rect>
+ </property>
+ <attribute name="horizontalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QPushButton" name="pushButton_addRow">
+ <property name="geometry">
+ <rect>
+ <x>23</x>
+ <y>250</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>澧炲姞涓�琛�</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>123</x>
+ <y>250</y>
+ <width>210</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>瑕佸垹闄ゆ煇涓�琛岀洿鎺ュ彸鍑诲垹闄ゅ嵆鍙�</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="pushButton_save">
+ <property name="geometry">
+ <rect>
+ <x>917</x>
+ <y>250</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>淇濆瓨</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="comboBox_company">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>20</y>
+ <width>989</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="pushButton_save_2">
+ <property name="geometry">
+ <rect>
+ <x>927</x>
+ <y>600</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>淇濆瓨</string>
+ </property>
+ </widget>
+ <widget class="QTableWidget" name="tableWidget_3">
+ <property name="geometry">
+ <rect>
+ <x>23</x>
+ <y>638</y>
+ <width>1009</width>
+ <height>471</height>
+ </rect>
+ </property>
+ <attribute name="horizontalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>鏂板缓鍒�</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>143</x>
+ <y>600</y>
+ <width>210</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>瑕佸垹闄ゆ煇涓�琛岀洿鎺ュ彸鍑诲垹闄ゅ嵆鍙�</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="pushButton_addRow_2">
+ <property name="geometry">
+ <rect>
+ <x>43</x>
+ <y>600</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>澧炲姞涓�琛�</string>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="menubar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1181</width>
+ <height>26</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--
Gitblit v1.8.0